q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2025-02-16 09:11:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add initial value for capture/time limit and cg_sigilLocation for domination to menu and misc fixes.

Browse source
This commit is contained in:
zturtleman 2019-05-22 00:16:33 +00:00
parent d1c5c322ed
commit 381d8f3fab
2 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
engine/code/q3_ui/ui_main.c
View file

@ -136,6 +136,13 @@ vmCvar_t ui_ctf_capturelimit;
vmCvar_t ui_ctf_timelimit;
vmCvar_t ui_ctf_friendly;
// Q3Rally Code Start
vmCvar_t ui_dom_capturelimit;
vmCvar_t ui_dom_timelimit;
vmCvar_t ui_dom_friendly;
vmCvar_t ui_sigilLocator;
// Q3Rally Code END
vmCvar_t ui_arenasFile;
vmCvar_t ui_botsFile;
vmCvar_t ui_spScores1;
@ -239,6 +246,13 @@ static cvarTable_t cvarTable[] = {
{ &ui_ctf_timelimit, "ui_ctf_timelimit", "30", CVAR_ARCHIVE },
{ &ui_ctf_friendly, "ui_ctf_friendly", "0", CVAR_ARCHIVE },
// Q3Rally Code Start
{ &ui_dom_capturelimit, "ui_dom_capturelimit", "0", CVAR_ARCHIVE },
{ &ui_dom_timelimit, "ui_dom_timelimit", "30", CVAR_ARCHIVE },
{ &ui_dom_friendly, "ui_dom_friendly", "0", CVAR_ARCHIVE },
{ &ui_sigilLocator, "cg_sigilLocator", "1", CVAR_ARCHIVE },
// Q3Rally Code END
{ &ui_racing_tracklength, "ui_racing_tracklength", "1", CVAR_ARCHIVE },
{ &ui_racing_trackreversed, "ui_racing_trackreversed", "0", CVAR_ARCHIVE },

30
engine/code/q3_ui/ui_rally_startserver.c
View file

@ -1434,7 +1434,7 @@ static void ServerOptions_Start( void ) {
case GT_TEAM_RACING_DM:
trap_Cvar_SetValue( "ui_team_racing_laplimit", fraglimit );
trap_Cvar_SetValue( "ui_team_racing_timelimit", timelimit );
trap_Cvar_SetValue( "ui_team_racing_friendlt", friendlyfire );
trap_Cvar_SetValue( "ui_team_racing_friendly", friendlyfire );
break;
case GT_DERBY:
@ -1449,23 +1449,24 @@ static void ServerOptions_Start( void ) {
case GT_TEAM:
trap_Cvar_SetValue( "ui_team_fraglimit", fraglimit );
trap_Cvar_SetValue( "ui_team_timelimit", timelimit );
trap_Cvar_SetValue( "ui_team_friendlt", friendlyfire );
trap_Cvar_SetValue( "ui_team_friendly", friendlyfire );
break;
case GT_CTF:
trap_Cvar_SetValue( "ui_ctf_fraglimit", fraglimit );
trap_Cvar_SetValue( "ui_ctf_capturelimit", flaglimit );
trap_Cvar_SetValue( "ui_ctf_timelimit", timelimit );
trap_Cvar_SetValue( "ui_ctf_friendlt", friendlyfire );
trap_Cvar_SetValue( "ui_ctf_friendly", friendlyfire );
break;
// Q3Rally Code Start
case GT_DOMINATION:
trap_Cvar_SetValue ("g_dominationSpawnStyle", Com_Clamp( 0, dominationSpawnStyle, dominationSpawnStyle ) );
trap_Cvar_SetValue ("cg_sigilLocator", Com_Clamp( 1, sigillocator, sigillocator) );
trap_Cvar_SetValue( "fraglimit", fraglimit );
trap_Cvar_SetValue( "timelimit", timelimit );
trap_Cvar_SetValue( "friendlt", friendlyfire );
trap_Cvar_SetValue( "g_dominationSpawnStyle", Com_Clamp( 0, 1, dominationSpawnStyle ) );
trap_Cvar_SetValue( "cg_sigilLocator", Com_Clamp( 0, 1, sigillocator) );
trap_Cvar_SetValue( "ui_dom_capturelimit", flaglimit );
trap_Cvar_SetValue( "ui_dom_timelimit", timelimit );
trap_Cvar_SetValue( "ui_dom_friendly", friendlyfire );
break;
// Q3Rally Code END
}
trap_Cvar_SetValue( "sv_maxclients", Com_Clamp( 0, 12, maxclients ) );
@ -2080,6 +2081,15 @@ static void ServerOptions_SetMenuItems( void ) {
Com_sprintf( s_serveroptions.timelimit.field.buffer, 4, "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_ctf_timelimit" ) ) );
s_serveroptions.friendlyfire.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_ctf_friendly" ) );
break;
// Q3Rally Code Start
case GT_DOMINATION:
Com_sprintf( s_serveroptions.flaglimit.field.buffer, 4, "%i", (int)Com_Clamp( 0, 100, trap_Cvar_VariableValue( "ui_dom_capturelimit" ) ) );
Com_sprintf( s_serveroptions.timelimit.field.buffer, 4, "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_dom_timelimit" ) ) );
s_serveroptions.friendlyfire.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_dom_friendly" ) );
s_serveroptions.sigillocator.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "cg_sigilLocator" ) );
break;
// Q3Rally Code END
}
Q_strncpyz( s_serveroptions.hostname.field.buffer, UI_Cvar_VariableString( "sv_hostname" ), sizeof( s_serveroptions.hostname.field.buffer ) );