From 21742055306bff3d5c641777ecadfc1e3d068581 Mon Sep 17 00:00:00 2001 From: s1lent Date: Sat, 4 Nov 2017 06:16:30 +0700 Subject: [PATCH] Move m_rgRewardAccountRules_default to CHalfLifeMultiplay --- regamedll/dlls/gamerules.h | 1 + regamedll/dlls/multiplay_gamerules.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/regamedll/dlls/gamerules.h b/regamedll/dlls/gamerules.h index af4da1a6..c9ec2ceb 100644 --- a/regamedll/dlls/gamerules.h +++ b/regamedll/dlls/gamerules.h @@ -676,6 +676,7 @@ private: public: static RewardAccount m_rgRewardAccountRules[RR_END]; + static RewardAccount m_rgRewardAccountRules_default[RR_END]; CVoiceGameMgr m_VoiceGameMgr; float m_flRestartRoundTime; // The global time when the round is supposed to end, if this is not 0 (deprecated name m_fTeamCount) diff --git a/regamedll/dlls/multiplay_gamerules.cpp b/regamedll/dlls/multiplay_gamerules.cpp index 1faa8d48..2a7099e0 100644 --- a/regamedll/dlls/multiplay_gamerules.cpp +++ b/regamedll/dlls/multiplay_gamerules.cpp @@ -3,7 +3,7 @@ CCStrikeGameMgrHelper g_GameMgrHelper; CHalfLifeMultiplay *g_pMPGameRules = nullptr; RewardAccount CHalfLifeMultiplay::m_rgRewardAccountRules[RR_END]; -RewardAccount m_rgRewardAccountRules_default[] = { +RewardAccount CHalfLifeMultiplay::m_rgRewardAccountRules_default[] = { REWARD_CTS_WIN, // RR_CTS_WIN REWARD_TERRORISTS_WIN, // RR_TERRORISTS_WIN REWARD_TARGET_BOMB, // RR_TARGET_BOMB @@ -118,7 +118,7 @@ bool CCStrikeGameMgrHelper::CanPlayerHearPlayer(CBasePlayer *pListener, CBasePla BOOL bListenerAlive = pListener->IsAlive(); BOOL bSenderAlive = pSender->IsAlive(); - return (bListenerAlive == bSenderAlive || bSenderAlive); // Dead/alive voice chats are separated, but dead can hear alive. + return (bListenerAlive == bSenderAlive || bSenderAlive); // Dead/alive voice chats are separated, but dead can hear alive. } void Broadcast(const char *sentence)