tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

Counter-Strike: Fix the money team rewards not being given out when a new 

round hits.
This commit is contained in:
Marco Cawthorne 2020-04-20 23:21:02 +02:00
parent 00b4fb9557
commit bb7522f971
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/cstrike/func_hostage_rescue.cpp
View File

@ -61,7 +61,7 @@ func_hostage_rescue::touch(void)
Money_AddMoney((player)hosty.m_eFollowing, 1000);
/* In Hostage Rescue, all Counter-Terrorists receive an $850
* bonus for every hostage they rescue, even if they lose the round. */
* bonus for every hostage that was rescued, even if they lose the round. */
Money_QueTeamReward(TEAM_CT, 850);
CBaseEntity targa = (CBaseEntity)other;

3
src/server/cstrike/game_money.c
View File

@ -41,9 +41,8 @@ Money_QueTeamReward(int t, int iMoneyValue)
}
void
Money_GiveTeamReward(void)
Money_GiveTeamReward(player pl)
{
player pl = (player)self;
if (pl.team == TEAM_T) {
Money_AddMoney(pl, g_cs_moneyreward_t);
} else {

4
src/server/cstrike/gamerules_multiplayer.cpp
View File

@ -366,8 +366,6 @@ Loop through all ents and handle them
void
CSMultiplayerRules::RestartRound(int iWipe)
{
g_cs_hostagesrescued = 0;
// Spawn/Respawn everyone at their team position and give them $$$
for (entity eFind = world; (eFind = find(eFind, ::classname, "player"));) {
player pl = (player)eFind;
@ -380,7 +378,7 @@ CSMultiplayerRules::RestartRound(int iWipe)
}
if (iWipe == FALSE) {
Money_GiveTeamReward();
Money_GiveTeamReward(pl);
} else {
pl.money = 0;
Money_AddMoney(pl, autocvar_mp_startmoney);

12
src/server/cstrike/money.h
View File

@ -17,11 +17,11 @@
int g_cs_moneyreward_ct;
int g_cs_moneyreward_t;
void Money_AddMoney(player pl, int iMoneyValue);
void Money_QueTeamReward(int t, int iMoneyValue);
void Money_GiveTeamReward(void);
void Money_AddMoney(player, int);
void Money_QueTeamReward(int, int);
void Money_GiveTeamReward(player);
void Money_ResetTeamReward(void);
int Money_GetLosses(int team);
int Money_HasBonus(int team);
void Money_HandleRoundReward(int winner)
int Money_GetLosses(int);
int Money_HasBonus(int);
void Money_HandleRoundReward(int)
void Money_ResetRoundReward(void);