fn/valve
fn/valve
3
0
Fork 1
Code Issues 11 Pull requests Projects Releases 3 Packages Wiki Activity Actions

mp_fraglimit and mp_timelimit are now aliases to the original Quake cvars

Browse source 
to avoid confusion from anyone wondering why there's two of them
This commit is contained in:
Marco Cawthorne 2021-12-12 21:04:15 -08:00
parent dd4a063fd0
commit 77a4d1b388
Signed by: eukara
GPG key ID: C196CD8BA993248A
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/client.qc
View file

@ -53,7 +53,7 @@ Game_ParseClientCommand(string cmd)
string msg;
string timestring;
float timeleft;
timeleft = cvar("mp_timelimit") - (time / 60);
timeleft = cvar("timelimit") - (time / 60);
timestring = Util_TimeToString(timeleft);
msg = sprintf("we have %s minutes remaining", timestring);
bprint(PRINT_CHAT, msg);

10
src/server/gamerules_multiplayer.qc
View file

@ -17,8 +17,8 @@
void
HLMultiplayerRules::FrameStart(void)
{
if (cvar("mp_timelimit"))
if (time >= (cvar("mp_timelimit") * 60)) {
if (cvar("timelimit"))
if (time >= (cvar("timelimit") * 60)) {
IntermissionStart();
}
@ -29,7 +29,7 @@ void
HLMultiplayerRules::CheckRules(void)
{
/* last person who killed somebody has hit the limit */
if (g_dmg_eAttacker.frags >= cvar("mp_fraglimit"))
if (g_dmg_eAttacker.frags >= cvar("fraglimit"))
IntermissionStart();
}
@ -186,6 +186,6 @@ void
HLMultiplayerRules::HLMultiplayerRules(void)
{
/* these lines do nothing but tell the server to register those cvars */
autocvar(mp_timelimit, 15, "Timelimit for multiplayer rounds");
autocvar(mp_fraglimit, 15, "Points limit for multiplayer rounds");
autocvar(timelimit, 15, "Timelimit for multiplayer rounds");
autocvar(fraglimit, 15, "Points limit for multiplayer rounds");
}

4
zpak001.pk3dir/default.cfg
View file

@ -43,3 +43,7 @@ seta "maxplayers" "8"
seta "con_color" "255 150 0"
seta "vgui_color" "255 170 0"
seta "cross_color" "0 255 0"
// config compat
alias mp_timelimit timelimit
alias mp_fraglimit fraglimit