fn/scihunt
fn/scihunt
3
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Server: Move the forceinfokey calls into InitPostEnts() because constructors aren't suited for those at all

Browse source
This commit is contained in:
Marco Cawthorne 2022-07-14 18:23:04 -07:00
parent 04ac41346f
commit 8ba0153c0c
Signed by: eukara
GPG key ID: CE2032F0A2882A22
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/gamerules.h
View file

@ -40,6 +40,7 @@ class HLGameRules:CGameRules
virtual void(void) CountScientists;
void(void) HLGameRules;
virtual void(void) InitPostEnts;
};
class SHTeamRules:HLGameRules
@ -57,6 +58,7 @@ class SHTeamRules:HLGameRules
virtual void(void) AddTeam1Kill;
virtual void(void) AddTeam2Kill;
virtual void(NSClientPlayer, entity) ScientistKill;
virtual void(void) InitPostEnts;
};
/* Standard Hunting (0):

22
src/server/gamerules.qc
View file

@ -276,6 +276,7 @@ HLGameRules::ScientistKill(NSClientPlayer pp, entity sci)
WriteByte(MSG_MULTICAST, 0);
msg_entity = world;
multicast([0,0,0], MULTICAST_ALL);
pl.frags++;
/*if (g_weapons[g_dmg_iWeapon].slot != 0)
@ -336,7 +337,7 @@ HLGameRules::FrameStart(void)
}
void
HLGameRules::HLGameRules(void)
HLGameRules::InitPostEnts(void)
{
forceinfokey(world, "teams", "0");
forceinfokey(world, "team_1", "");
@ -345,6 +346,14 @@ HLGameRules::HLGameRules(void)
forceinfokey(world, "teamscore_2", "0");
forceinfokey(world, "teamkills_1", "0");
forceinfokey(world, "teamkills_2", "0");
m_iScientistsAlive = 0;
m_flRestockTimer = 0;
m_flBreakRespawnTimer = 0;
}
void
HLGameRules::HLGameRules(void)
{
}
/* TEAMPLAY ONLY LOGIC */
@ -410,10 +419,8 @@ SHTeamRules::AddTeam2Kill(void)
}
void
SHTeamRules::SHTeamRules(void)
SHTeamRules::InitPostEnts(void)
{
m_iKillsTeam1 = 0;
m_iKillsTeam2 = 0;
forceinfokey(world, "teamkills_1", sprintf("%i", m_iKillsTeam1));
forceinfokey(world, "teamkills_2", sprintf("%i", m_iKillsTeam2));
forceinfokey(world, "teams", "2");
@ -422,3 +429,10 @@ SHTeamRules::SHTeamRules(void)
forceinfokey(world, "team_2", "Blue");
forceinfokey(world, "teamscore_2", "0");
}
void
SHTeamRules::SHTeamRules(void)
{
m_iKillsTeam1 = 0;
m_iKillsTeam2 = 0;
}