fn/cstrike
fn/cstrike
3
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Unbreak the gamerule timer. Sorry about that!

Browse source
This commit is contained in:
Marco Cawthorne 2022-04-23 14:45:12 -07:00
parent 294af509ad
commit 3ffd8262b9
Signed by: eukara
GPG key ID: C196CD8BA993248A
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/defs.h
View file

@ -42,6 +42,8 @@ var int g_cs_alive_ct;
var int g_cs_total_t;
var int g_cs_total_ct;
var int g_total_players;
var int g_cs_hostagesrescued;
var int g_cs_hostagestotal;
var int g_cs_roundslost_ct;

40
src/server/gamerules_multiplayer.qc
View file

@ -112,13 +112,9 @@ CSMultiplayerRules::PlayerPreFrame(base_player pl)
void
CSMultiplayerRules::FrameStart(void)
{
int iInGamePlayers;
iInGamePlayers = g_cs_total_t + g_cs_total_ct;
if ((iInGamePlayers > 0) && (g_cs_gamestate == GAME_INACTIVE)) {
if ((g_total_players > 0) && (g_cs_gamestate == GAME_INACTIVE)) {
TimerBegin(2, GAME_COMMENCING);
} else if (iInGamePlayers == 0) {
} else if (g_total_players == 0) {
g_cs_gamestate = GAME_INACTIVE;
g_cs_gametime = 0;
g_cs_roundswon_t = 0;
@ -227,12 +223,17 @@ CSMultiplayerRules::InitPostEnts(void)
void
CSMultiplayerRules::TimerBegin(float tleft, int mode)
{
g_cs_gametime = tleft;
if (mode == GAME_FREEZE) {
g_cs_gamestate = GAME_FREEZE;
} else if (mode == GAME_ACTIVE) {
g_cs_gamestate = GAME_ACTIVE;
CountPlayers();
if (g_total_players < 2)
return;
/* if no players are present in the chosen team, force restart round */
if ((g_cs_alive_t == 0)) {
RoundOver(TEAM_CT, 3600, FALSE);
@ -249,20 +250,16 @@ CSMultiplayerRules::TimerBegin(float tleft, int mode)
} else if (mode == GAME_OVER) {
g_cs_gamestate = GAME_OVER;
}
g_cs_gametime = tleft;
}
void
CSMultiplayerRules::TimerUpdate(void)
{
if (cvar("sv_playerslots") == 1) {
g_cs_gametime = -1;
return;
}
/* if we've got hostages in the map... */
if (g_cs_hostagestotal > 0) {
/* and they're all rescued.... */
if (g_cs_hostagesrescued >= g_cs_hostagestotal) {
/* CTs win! */
RoundOver(TEAM_CT, 0, FALSE);
return;
}
@ -281,23 +278,21 @@ CSMultiplayerRules::TimerUpdate(void)
// Okay, this means that timelimit is not the only deciding factor
if (autocvar_mp_winlimit > 0 && g_cs_gamestate != GAME_OVER) {
// It really doesn't matter who won. Do some logging perhaps?
if (g_cs_roundswon_ct == autocvar_mp_winlimit) {
IntermissionStart();
} else if (g_cs_roundswon_t == autocvar_mp_winlimit) {
if (g_cs_roundswon_ct == autocvar_mp_winlimit ||
g_cs_roundswon_t == autocvar_mp_winlimit) {
IntermissionStart();
}
}
/* INACTIVE means no one is registered as a player */
if (g_cs_gamestate == GAME_INACTIVE) {
return;
}
if (g_cs_gametime > 0) {
g_cs_gametime -= frametime;
} else {
g_cs_gametime = 0;
}
/* our continously running down timer */
g_cs_gametime = bound(0, g_cs_gametime - frametime, g_cs_gametime);
/* if the round is over or the game is done with... */
if (g_cs_gamestate == GAME_COMMENCING || g_cs_gamestate == GAME_END) {
if (g_cs_gametime <= 0) {
if (g_cs_roundswon_t == 0 && g_cs_roundswon_ct == 0) {
@ -639,6 +634,9 @@ CSMultiplayerRules::CountPlayers(void)
if (eFind.health > 0)
g_cs_alive_ct++;
}
g_total_players = g_cs_total_t + g_cs_total_ct;
}
void