Skip to content

feat: add "RANDOM" bot to "ADD BOTS" menu #727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WofWca wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add "RANDOM" bot to "ADD BOTS" menu #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,10 @@ set using command line arguments:
cl_aviMotionJpeg is enabled
r_mode -2 - This new video mode automatically uses the
desktop resolution.
ui_oldUi - Try to preserve the old UI look. Remove
some new items, such as "RANDOM" bot
in "ADD BOT" menu.
This only restores _some_ of the changes.
```

## New commands
Expand Down
23 changes: 19 additions & 4 deletions code/q3_ui/ui_addbots.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ typedef struct {
menubitmap_s go;
menubitmap_s back;

qboolean includeRandomBotItem;
int numBots;
int delay;
int baseBotNum;
Expand Down Expand Up @@ -144,11 +145,17 @@ UI_AddBotsMenu_SetBotNames
*/
static void UI_AddBotsMenu_SetBotNames( void ) {
int n;
int arrayOffset = addBotsMenuInfo.includeRandomBotItem ? -1 : 0;
const char *info;

for ( n = 0; n < 7; n++ ) {
info = UI_GetBotInfoByNumber( addBotsMenuInfo.sortedBotNums[addBotsMenuInfo.baseBotNum + n] );
Q_strncpyz( addBotsMenuInfo.botnames[n], Info_ValueForKey( info, "name" ), sizeof(addBotsMenuInfo.botnames[n]) );
int ind = addBotsMenuInfo.baseBotNum + n + arrayOffset;
if (ind < 0) {
Q_strncpyz( addBotsMenuInfo.botnames[n], "RANDOM", sizeof(addBotsMenuInfo.botnames[n]) );
} else {
info = UI_GetBotInfoByNumber( addBotsMenuInfo.sortedBotNums[ind] );
Q_strncpyz( addBotsMenuInfo.botnames[n], Info_ValueForKey( info, "name" ), sizeof(addBotsMenuInfo.botnames[n]) );
}
}

}
Expand Down Expand Up @@ -177,11 +184,14 @@ UI_AddBotsMenu_DownEvent
=================
*/
static void UI_AddBotsMenu_DownEvent( void* ptr, int event ) {
int numMenuItems;

if (event != QM_ACTIVATED) {
return;
}

if( addBotsMenuInfo.baseBotNum + 7 < addBotsMenuInfo.numBots ) {
numMenuItems = addBotsMenuInfo.numBots + (addBotsMenuInfo.includeRandomBotItem ? 1 : 0);
if( addBotsMenuInfo.baseBotNum + 7 < numMenuItems ) {
addBotsMenuInfo.baseBotNum++;
UI_AddBotsMenu_SetBotNames();
}
Expand Down Expand Up @@ -263,8 +273,13 @@ static void UI_AddBotsMenu_Init( void ) {

UI_AddBots_Cache();

// TODO declare this cvar.
addBotsMenuInfo.includeRandomBotItem = !trap_Cvar_VariableValue( "ui_oldUi" );
addBotsMenuInfo.numBots = UI_GetNumBots();
count = addBotsMenuInfo.numBots < 7 ? addBotsMenuInfo.numBots : 7;
count = addBotsMenuInfo.numBots + (addBotsMenuInfo.includeRandomBotItem ? 1 : 0);
if (count > 7) {
count = 7;
}

addBotsMenuInfo.banner.generic.type = MTYPE_BTEXT;
addBotsMenuInfo.banner.generic.x = 320;
Expand Down
Loading