nuclide-ports/ts
nuclide-ports
/
ts
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup: Some CGameRules methods are now of type 'bool' 

Remove rules.qc
This commit is contained in:
Marco Cawthorne 2022-07-16 15:09:58 -07:00
parent 9c558a8f5c
commit 3e3439e10e
Signed by: eukara
GPG Key ID: CE2032F0A2882A22
4 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/scoreboard.qc
View File

@ -181,7 +181,7 @@ Scores_Draw(void)
pos = video_mins + [(video_res[0] / 2) - 145, 30];
}
if (Util_IsTeamPlay()) {
if (Util_IsTeamplay()) {
Scores_DrawTeam(pl, pos);
} else {
Scores_DrawNormal(pl, pos);

2
src/server/gamerules.h
View File

@ -97,7 +97,7 @@ class TSMultiplayerRules:TSGameRules
virtual void(NSClientPlayer) PlayerPreFrame;
virtual void(NSClientPlayer) PlayerPostFrame;
virtual void(NSClientPlayer) PlayerDeath;
virtual float(NSClientPlayer, string) ConsoleCommand;
virtual bool(NSClientPlayer, string) ConsoleCommand;
virtual void(float, int) TimerBegin;
virtual void(void) TimerUpdate;

1
src/server/progs.src
View File

@ -137,7 +137,6 @@ init.qc
//../../../base/src/server/damage.qc
damage.qc
rules.qc
../../../base/src/server/modelevent.qc
spawn.qc

20
src/server/rules.qc
View File

@ -1,20 +0,0 @@
/*
* Copyright (c) 2016-2020 Marco Cawthorne <marco@icculus.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
int Rules_IsTeamPlay(void)
{
return cvar("teamplay");
}