Skip to content

Added syncing bot skill in server options menu with g_spSkill #600

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added syncing bot skill in server options menu with g_spSkill #600

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
29 changes: 28 additions & 1 deletion code/q3_ui/ui_startserver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,7 @@ SERVER OPTIONS MENU *****
#define ID_DEDICATED 22
#define ID_GO 23
#define ID_BACK 24
#define ID_SKILL 25

#define PLAYER_SLOTS 12

Expand Down Expand Up @@ -931,6 +932,19 @@ static void ServerOptions_SetPlayerItems( void ) {
}


/*
=================
ServerOptions_SaveSkill
=================
*/
static void ServerOptions_SaveSkill() {
int skill;

skill = s_serveroptions.botSkill.curvalue + 1;
trap_Cvar_SetValue("g_spSkill", skill);
}


/*
=================
ServerOptions_Event
Expand Down Expand Up @@ -971,6 +985,12 @@ static void ServerOptions_Event( void* ptr, int event ) {
}
UI_PopMenu();
break;
case ID_SKILL:
if( event != QM_ACTIVATED ) {
break;
}
ServerOptions_SaveSkill();
break;
}
}

Expand Down Expand Up @@ -1243,12 +1263,17 @@ ServerOptions_MenuInit
static void ServerOptions_MenuInit( qboolean multiplayer ) {
int y;
int n;
int skill;

memset( &s_serveroptions, 0 ,sizeof(serveroptions_t) );
s_serveroptions.multiplayer = multiplayer;
s_serveroptions.gametype = (int) Com_Clamp(0, ARRAY_LEN(gametype_remap2) - 1,
trap_Cvar_VariableValue("g_gametype"));
s_serveroptions.punkbuster.curvalue = Com_Clamp( 0, 1, trap_Cvar_VariableValue( "sv_punkbuster" ) );
skill = (int)trap_Cvar_VariableValue("g_spSkill");
if (skill < 1 || skill > 5) {
skill = 2;
}

ServerOptions_Cache();

Expand Down Expand Up @@ -1363,10 +1388,12 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) {
s_serveroptions.botSkill.generic.type = MTYPE_SPINCONTROL;
s_serveroptions.botSkill.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
s_serveroptions.botSkill.generic.name = "Bot Skill:";
s_serveroptions.botSkill.generic.id = ID_SKILL;
s_serveroptions.botSkill.generic.callback = ServerOptions_Event;
s_serveroptions.botSkill.generic.x = 32 + (strlen(s_serveroptions.botSkill.generic.name) + 2 ) * SMALLCHAR_WIDTH;
s_serveroptions.botSkill.generic.y = y;
s_serveroptions.botSkill.itemnames = botSkill_list;
s_serveroptions.botSkill.curvalue = 1;
s_serveroptions.botSkill.curvalue = skill-1;

y += ( 2 * SMALLCHAR_HEIGHT );
s_serveroptions.player0.generic.type = MTYPE_TEXT;
Expand Down