8000 ebx: Remove g_instagib from menu and callvote · Turtle-Arena/turtle-arena-code@7645640 · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7645640

Browse files
zturtlemanzturtleman
committed
ebx: Remove g_instagib from menu and callvote
I already remove it actually logic from game code.
1 parent 1109ba2 commit 7645640

File tree

4 files changed

+92
-3
lines changed

4 files changed

+92
-3
lines changed

‎code/cgame/cg_consolecmds.c

+13-1
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,19 @@ CG_CallVoteComplete
16201620
*/
16211621
static void CG_CallVoteComplete( int localPlayerNum, char *args, int argNum ) {
16221622
if ( argNum == 2 ) {
1623-
trap_Field_CompleteList( "capturelimit\0fraglimit\0g_doWarmup\0g_gametype\0g_instagib\0kick\0kicknum\0map\0map_restart\0nextmap\0timelimit\0" );
1623+
trap_Field_CompleteList( "capturelimit\0"
1624+
#ifndef NOTRATEDM // frag to score
1625+
"fraglimit\0"
1626+
#endif
1627+
"g_doWarmup\0g_gametype\0"
1628+
#ifndef TA_WEAPSYS
1629+
"g_instagib\0"
1630+
#endif
1631+
"kick\0kicknum\0map\0map_restart\0nextmap\0"
1632+
#ifdef NOTRATEDM // frag to score
1633+
"scorelimit\0"
1634+
#endif
1635+
"timelimit\0" );
16241636
}
16251637
if ( argNum == 3 && !Q_stricmp( CG_Argv( 1 ), "kick" ) ) {
16261638
CG_Field_CompletePlayerName( -1, qfalse, qfalse );

‎code/game/g_cmds.c

+8-2
Original file line numberDiff line numberDiff line change
@@ -1639,11 +1639,17 @@ void Cmd_CallVote_f( gentity_t *ent ) {
16391639
arg2RangeMax = 1;
16401640
} else {
16411641
trap_SendServerCommand( ent-g_entities, "print \"Invalid vote string.\n\"" );
1642+
trap_SendServerCommand( ent-g_entities, "print \"Vote commands are: map_restart, nextmap, map <mapname>, g_gametype <n>, kick <player>, kicknum <playernum>, g_doWarmup <boolean>, timelimit <time>"
16421643
#ifdef NOTRATEDM // frag to score
1643-
trap_SendServerCommand( ent-g_entities, "print \"Vote commands are: map_restart, nextmap, map <mapname>, g_gametype <n>, kick <player>, kicknum <playernum>, g_doWarmup <boolean>, timelimit <time>, scorelimit <score>, capturelimit <captures>, g_instagib <boolean>.\n\"" );
1644+
", scorelimit <score>"
16441645
#else
1645-
trap_SendServerCommand( ent-g_entities, "print \"Vote commands are: map_restart, nextmap, map <mapname>, g_gametype <n>, kick <player>, kicknum <playernum>, g_doWarmup <boolean>, timelimit <time>, fraglimit <frags>, capturelimit <captures>, g_instagib <boolean>.\n\"" );
1646+
", fraglimit <frags>"
16461647
#endif
1648+
", capturelimit <captures>"
1649+
#ifndef TA_WEAPSYS
1650+
", g_instagib <boolean>"
1651+
#endif
1652+
".\n\"" );
16471653
return;
16481654
}
16491655

‎code/q3_ui/ui_main.c

+28
Original file line numberDiff line numberDiff line change
@@ -64,40 +64,54 @@ typedef struct {
6464

6565
vmCvar_t ui_ffa_fraglimit;
6666
vmCvar_t ui_ffa_timelimit;
67+
#ifndef TA_WEAPSYS
6768
vmCvar_t ui_ffa_instagib;
69+
#endif
6870

6971
vmCvar_t ui_tourney_fraglimit;
7072
vmCvar_t ui_tourney_timelimit;
73+
#ifndef TA_WEAPSYS
7174
vmCvar_t ui_tourney_instagib;
75+
#endif
7276

7377
vmCvar_t ui_team_fraglimit;
7478
vmCvar_t ui_team_timelimit;
7579
vmCvar_t ui_team_friendly;
80+
#ifndef TA_WEAPSYS
7681
vmCvar_t ui_team_instagib;
82+
#endif
7783

7884
vmCvar_t ui_ctf_capturelimit;
7985
vmCvar_t ui_ctf_timelimit;
8086
vmCvar_t ui_ctf_friendly;
87+
#ifndef TA_WEAPSYS
8188
vmCvar_t ui_ctf_instagib;
89+
#endif
8290

8391
#ifdef MISSIONPACK
8492
vmCvar_t ui_1flag_capturelimit;
8593
vmCvar_t ui_1flag_timelimit;
8694
vmCvar_t ui_1flag_friendly;
95+
#ifndef TA_WEAPSYS
8796
vmCvar_t ui_1flag_instagib;
97+
#endif
8898

8999
vmCvar_t ui_obelisk_capturelimit;
90100
vmCvar_t ui_obelisk_timelimit;
91101
vmCvar_t ui_obelisk_friendly;
102+
#ifndef TA_WEAPSYS
92103
vmCvar_t ui_obelisk_instagib;
104+
#endif
93105

94106
#ifdef MISSIONPACK_HARVESTER
95107
vmCvar_t ui_harvester_capturelimit;
96108
vmCvar_t ui_harvester_timelimit;
97109
vmCvar_t ui_harvester_friendly;
110+
#ifndef TA_WEAPSYS
98111
vmCvar_t ui_harvester_instagib;
99112
#endif
100113
#endif
114+
#endif
101115

102116
vmCvar_t ui_publicServer;
103117

@@ -165,15 +179,19 @@ static cvarTable_t cvarTable[] = {
165179
{ &ui_ffa_fraglimit, "ui_ffa_fraglimit", "20", CVAR_ARCHIVE },
166180
#endif
167181
{ &ui_ffa_timelimit, "ui_ffa_timelimit", "0", CVAR_ARCHIVE },
182+
#ifndef TA_WEAPSYS
168183
{ &ui_ffa_instagib, "ui_ffa_instagib", "0", CVAR_ARCHIVE },
184+
#endif
169185

170186
#ifdef NOTRATEDM // frag to score
171187
{ &ui_tourney_fraglimit, "ui_tourney_scorelimit", "0", CVAR_ARCHIVE },
172188
#else
173189
{ &ui_tourney_fraglimit, "ui_tourney_fraglimit", "0", CVAR_ARCHIVE },
174190
#endif
175191
{ &ui_tourney_timelimit, "ui_tourney_timelimit", "15", CVAR_ARCHIVE },
192+
#ifndef TA_WEAPSYS
176193
{ &ui_tourney_instagib, "ui_tourney_instagib", "0", CVAR_ARCHIVE },
194+
#endif
177195

178196
#ifdef NOTRATEDM // frag to score
179197
{ &ui_team_fraglimit, "ui_team_scorelimit", "0", CVAR_ARCHIVE },
@@ -182,7 +200,9 @@ static cvarTable_t cvarTable[] = {
182200
#endif
183201
{ &ui_team_timelimit, "ui_team_timelimit", "20", CVAR_ARCHIVE },
184202
{ &ui_team_friendly, "ui_team_friendly", "1", CVAR_ARCHIVE },
203+
#ifndef TA_WEAPSYS
185204
{ &ui_team_instagib, "ui_team_instagib", "0", CVAR_ARCHIVE },
205+
#endif
186206

187207
#ifdef TA_MISC
188208
{ &ui_ctf_capturelimit, "ui_ctf_capturelimit", "5", CVAR_ARCHIVE },
@@ -191,25 +211,33 @@ static cvarTable_t cvarTable[] = {
191211
#endif
192212
{ &ui_ctf_timelimit, "ui_ctf_timelimit", "30", CVAR_ARCHIVE },
193213
{ &ui_ctf_friendly, "ui_ctf_friendly", "0", CVAR_ARCHIVE },
214+
#ifndef TA_WEAPSYS
194215
{ &ui_ctf_instagib, "ui_ctf_instagib", "0", CVAR_ARCHIVE },
216+
#endif
195217

196218
#ifdef MISSIONPACK
197219
{ &ui_1flag_capturelimit, "ui_1flag_capturelimit", "5", CVAR_ARCHIVE },
198220
{ &ui_1flag_timelimit, "ui_1flag_timelimit", "30", CVAR_ARCHIVE },
199221
{ &ui_1flag_friendly, "ui_1flag_friendly", "0", CVAR_ARCHIVE },
222+
#ifndef TA_WEAPSYS
200223
{ &ui_1flag_instagib, "ui_1flag_instagib", "0", CVAR_ARCHIVE },
224+
#endif
201225

202226
{ &ui_obelisk_capturelimit, "ui_obelisk_capturelimit", "5", CVAR_ARCHIVE },
203227
{ &ui_obelisk_timelimit, "ui_obelisk_timelimit", "20", CVAR_ARCHIVE },
204228
{ &ui_obelisk_friendly, "ui_obelisk_friendly", "0", CVAR_ARCHIVE },
229+
#ifndef TA_WEAPSYS
205230
{ &ui_obelisk_instagib, "ui_obelisk_instagib", "0", CVAR_ARCHIVE },
231+
#endif
206232

207233
#ifdef MISSIONPACK_HARVESTER
208234
{ &ui_harvester_capturelimit, "ui_harvester_capturelimit", "5", CVAR_ARCHIVE },
209235
{ &ui_harvester_timelimit, "ui_harvester_timelimit", "30", CVAR_ARCHIVE },
210236
{ &ui_harvester_friendly, "ui_harvester_friendly", "0", CVAR_ARCHIVE },
237+
#ifndef TA_WEAPSYS
211238
{ &ui_harvester_instagib, "ui_harvester_instagib", "0", CVAR_ARCHIVE },
212239
#endif
240+
#endif
213241
#endif
214242

215243
{ &ui_publicServer, "ui_publicServer", "1", CVAR_ARCHIVE },

‎code/q3_ui/ui_startserver.c

+43
Original file line numberDiff line numberDiff line change
@@ -1931,7 +1931,9 @@ typedef struct {
19311931
menufield_s flaglimit;
19321932
menuradiobutton_s friendlyfire;
19331933
menufield_s hostname;
1934+
#ifndef TA_WEAPSYS
19341935
menuradiobutton_s instagib;
1936+
#endif
19351937
menuradiobutton_s pure;
19361938
menulist_s botSkill;
19371939

@@ -2041,7 +2043,9 @@ static void ServerOptions_Start( void ) {
20412043
int dedicated;
20422044
int friendlyfire;
20432045
int flaglimit;
2046+
#ifndef TA_WEAPSYS
20442047
int instagib;
2048+
#endif
20452049
int pure;
20462050
int skill;
20472051
int n;
@@ -2054,7 +2058,9 @@ static void ServerOptions_Start( void ) {
20542058
publicserver = s_serveroptions.publicserver.curvalue;
20552059
dedicated = s_serveroptions.dedicated.curvalue;
20562060
friendlyfire = s_serveroptions.friendlyfire.curvalue;
2061+
#ifndef TA_WEAPSYS
20572062
instagib = s_serveroptions.instagib.curvalue;
2063+
#endif
20582064
pure = s_serveroptions.pure.curvalue;
20592065
skill = s_serveroptions.botSkill.curvalue + 1;
20602066

@@ -2086,7 +2092,9 @@ static void ServerOptions_Start( void ) {
20862092
trap_Cvar_SetValue( "ui_ffa_fraglimit", fraglimit );
20872093
#endif
20882094
trap_Cvar_SetValue( "ui_ffa_timelimit", timelimit );
2095+
#ifndef TA_WEAPSYS
20892096
trap_Cvar_SetValue( "ui_ffa_instagib", instagib );
2097+
#endif
20902098
break;
20912099

20922100
case GT_TOURNAMENT:
@@ -2096,7 +2104,9 @@ static void ServerOptions_Start( void ) {
20962104
trap_Cvar_SetValue( "ui_tourney_fraglimit", fraglimit );
20972105
#endif
20982106
trap_Cvar_SetValue( "ui_tourney_timelimit", timelimit );
2107+
#ifndef TA_WEAPSYS
20992108
trap_Cvar_SetValue( "ui_tourney_instagib", instagib );
2109+
#endif
21002110
break;
21012111

21022112
#ifdef TA_SP
@@ -2113,37 +2123,47 @@ static void ServerOptions_Start( void ) {
21132123
#endif
21142124
trap_Cvar_SetValue( "ui_team_timelimit", timelimit );
21152125
trap_Cvar_SetValue( "ui_team_friendly", friendlyfire );
2126+
#ifndef TA_WEAPSYS
21162127
trap_Cvar_SetValue( "ui_team_instagib", instagib );
2128+
#endif
21172129
break;
21182130

21192131
case GT_CTF:
21202132
trap_Cvar_SetValue( "ui_ctf_capturelimit", flaglimit );
21212133
trap_Cvar_SetValue( "ui_ctf_timelimit", timelimit );
21222134
trap_Cvar_SetValue( "ui_ctf_friendly", friendlyfire );
2135+
#ifndef TA_WEAPSYS
21232136
trap_Cvar_SetValue( "ui_ctf_instagib", instagib );
2137+
#endif
21242138
break;
21252139

21262140
#ifdef MISSIONPACK
21272141
case GT_1FCTF:
21282142
trap_Cvar_SetValue( "ui_1flag_capturelimit", flaglimit );
21292143
trap_Cvar_SetValue( "ui_1flag_timelimit", timelimit );
21302144
trap_Cvar_SetValue( "ui_1flag_friendly", friendlyfire );
2145+
#ifndef TA_WEAPSYS
21312146
trap_Cvar_SetValue( "ui_1flag_instagib", instagib );
2147+
#endif
21322148
break;
21332149

21342150
case GT_OBELISK:
21352151
trap_Cvar_SetValue( "ui_obelisk_capturelimit", flaglimit );
21362152
trap_Cvar_SetValue( "ui_obelisk_timelimit", timelimit );
21372153
trap_Cvar_SetValue( "ui_obelisk_friendly", friendlyfire );
2154+
#ifndef TA_WEAPSYS
21382155
trap_Cvar_SetValue( "ui_obelisk_instagib", instagib );
2156+
#endif
21392157
break;
21402158

21412159
#ifdef MISSIONPACK_HARVESTER
21422160
case GT_HARVESTER:
21432161
trap_Cvar_SetValue( "ui_harvester_capturelimit", flaglimit );
21442162
trap_Cvar_SetValue( "ui_harvester_timelimit", timelimit );
21452163
trap_Cvar_SetValue( "ui_harvester_friendly", friendlyfire );
2164+
#ifndef TA_WEAPSYS
21462165
trap_Cvar_SetValue( "ui_harvester_instagib", instagib );
2166+
#endif
21472167
break;
21482168
#endif
21492169
#endif
@@ -2169,7 +2189,9 @@ static void ServerOptions_Start( void ) {
21692189
#endif
21702190
trap_Cvar_SetValue ("capturelimit", Com_Clamp( 0, flaglimit, flaglimit ) );
21712191
trap_Cvar_SetValue( "g_friendlyfire", friendlyfire );
2192+
#ifndef TA_WEAPSYS
21722193
trap_Cvar_SetValue( "g_instagib", instagib );
2194+
#endif
21732195
trap_Cvar_SetValue( "sv_pure", pure );
21742196
trap_Cvar_Set("sv_hostname", MField_Buffer( &s_serveroptions.hostname.field ) );
21752197

@@ -2642,7 +2664,9 @@ static void ServerOptions_SetMenuItems( void ) {
26422664
MField_SetText( &s_serveroptions.fraglimit.field, va( "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_ffa_fraglimit" ) ) ) );
26432665
#endif
26442666
MField_SetText( &s_serveroptions.timelimit.field, va( "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_ffa_timelimit" ) ) ) );
2667+
#ifndef TA_WEAPSYS
26452668
s_serveroptions.instagib.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_ffa_instagib" ) );
2669+
#endif
26462670
break;
26472671

26482672
case GT_TOURNAMENT:
@@ -2652,14 +2676,19 @@ static void ServerOptions_SetMenuItems( void ) {
26522676
MField_SetText( &s_serveroptions.fraglimit.field, va( "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_tourney_fraglimit" ) ) ) );
26532677
#endif
26542678
MField_SetText( &s_serveroptions.timelimit.field, va( "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_tourney_timelimit" ) ) ) );
2679+
#ifndef TA_WEAPSYS
26552680
s_serveroptions.instagib.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_tourney_instagib" ) );
2681+
#endif
26562682
break;
26572683

26582684
#ifdef TA_SP
26592685
case GT_SINGLE_PLAYER:
26602686
MField_SetText( &s_serveroptions.fraglimit.field, "0" );
26612687
MField_SetText( &s_serveroptions.timelimit.field, "0" );
26622688
s_serveroptions.friendlyfire.curvalue = 0;
2689+
#ifndef TA_WEAPSYS
2690+
s_serveroptions.instagib.curvalue = 0;
2691+
#endif
26632692
break;
26642693
#endif
26652694

@@ -2671,37 +2700,47 @@ static void ServerOptions_SetMenuItems( void ) {
26712700
#endif
26722701
MField_SetText( &s_serveroptions.timelimit.field, va( "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_team_timelimit" ) ) ) );
26732702
s_serveroptions.friendlyfire.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_team_friendly" ) );
2703+
#ifndef TA_WEAPSYS
26742704
s_serveroptions.instagib.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_team_instagib" ) );
2705+
#endif
26752706
break;
26762707

26772708
case GT_CTF:
26782709
MField_SetText( &s_serveroptions.flaglimit.field, va( "%i", (int)Com_Clamp( 0, 100, trap_Cvar_VariableValue( "ui_ctf_capturelimit" ) ) ) );
26792710
MField_SetText( &s_serveroptions.timelimit.field, va( "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_ctf_timelimit" ) ) ) );
26802711
s_serveroptions.friendlyfire.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_ctf_friendly" ) );
2712+
#ifndef TA_WEAPSYS
26812713
s_serveroptions.instagib.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_ctf_instagib" ) );
2714+
#endif
26822715
break;
26832716

26842717
#ifdef MISSIONPACK
26852718
case GT_1FCTF:
26862719
MField_SetText( &s_serveroptions.flaglimit.field, va( "%i", (int)Com_Clamp( 0, 100, trap_Cvar_VariableValue( "ui_1flag_capturelimit" ) ) ) );
26872720
MField_SetText( &s_serveroptions.timelimit.field, va( "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_1flag_timelimit" ) ) ) );
26882721
s_serveroptions.friendlyfire.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_1flag_friendly" ) );
2722+
#ifndef TA_WEAPSYS
26892723
s_serveroptions.instagib.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_1flag_instagib" ) );
2724+
#endif
26902725
break;
26912726

26922727
case GT_OBELISK:
26932728
MField_SetText( &s_serveroptions.flaglimit.field, va( "%i", (int)Com_Clamp( 0, 100, trap_Cvar_VariableValue( "ui_obelisk_capturelimit" ) ) ) );
26942729
MField_SetText( &s_serveroptions.timelimit.field, va( "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_obelisk_timelimit" ) ) ) );
26952730
s_serveroptions.friendlyfire.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_obelisk_friendly" ) );
2731+
#ifndef TA_WEAPSYS
26962732
s_serveroptions.instagib.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_obelisk_instagib" ) );
2733+
#endif
26972734
break;
26982735

26992736
#ifdef MISSIONPACK_HARVESTER
27002737
case GT_HARVESTER:
27012738
MField_SetText( &s_serveroptions.flaglimit.field, va( "%i", (int)Com_Clamp( 0, 100, trap_Cvar_VariableValue( "ui_harvester_capturelimit" ) ) ) );
27022739
MField_SetText( &s_serveroptions.timelimit.field, va( "%i", (int)Com_Clamp( 0, 999, trap_Cvar_VariableValue( "ui_harvester_timelimit" ) ) ) );
27032740
s_serveroptions.friendlyfire.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_harvester_friendly" ) );
2741+
#ifndef TA_WEAPSYS
27042742
s_serveroptions.instagib.curvalue = (int)Com_Clamp( 0, 1, trap_Cvar_VariableValue( "ui_harvester_instagib" ) );
2743+
#endif
27052744
break;
27062745
#endif
27072746
#endif
@@ -2888,12 +2927,14 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) {
28882927
#endif
28892928
}
28902929

2930+
#ifndef TA_WEAPSYS
28912931
y += BIGCHAR_HEIGHT+2;
28922932
s_serveroptions.instagib.generic.type = MTYPE_RADIOBUTTON;
28932933
s_serveroptions.instagib.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
28942934
s_serveroptions.instagib.generic.x = OPTIONS_X;
28952935
s_serveroptions.instagib.generic.y = y;
28962936
s_serveroptions.instagib.generic.name = "Instagib:";
2937+
#endif
28972938

28982939
y += BIGCHAR_HEIGHT+2;
28992940
s_serveroptions.pure.generic.type = MTYPE_RADIOBUTTON;
@@ -3073,7 +3114,9 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) {
30733114
if( s_serveroptions.gametype >= GT_TEAM ) {
30743115
Menu_AddItem( &s_serveroptions.menu, &s_serveroptions.friendlyfire );
30753116
}
3117+
#ifndef TA_WEAPSYS
30763118
Menu_AddItem( &s_serveroptions.menu, &s_serveroptions.instagib );
3119+
#endif
30773120
Menu_AddItem( &s_serveroptions.menu, &s_serveroptions.pure );
30783121
if( s_serveroptions.multiplayer ) {
30793122
Menu_AddItem( &s_serveroptions.menu, &s_serveroptions.publicserver );

0 commit comments

Comments
 (0)
0