UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cstrike: Fix wrong timeleft calculation (#1072)

Browse Source 
* Fix wrong timeleft calculation

* reorder function calls
This commit is contained in:
BotoX 2019-09-03 00:33:28 +02:00
parent 2e28df3dc6
commit 8db2132856
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/cstrike/extension.cpp
View File

@ -51,6 +51,7 @@ IGameConfig *g_pGameConf = NULL;
IGameEventManager2 *gameevents = NULL; IGameEventManager2 *gameevents = NULL;
bool hooked_everything = false; bool hooked_everything = false;
int g_msgHintText = -1; int g_msgHintText = -1;
CGlobalVars *gpGlobals;
SMEXT_LINK(&g_CStrike); SMEXT_LINK(&g_CStrike);
@ -107,6 +108,7 @@ bool CStrike::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool
{ {
GET_V_IFACE_CURRENT(GetEngineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2); GET_V_IFACE_CURRENT(GetEngineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2);
GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER); GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);
gpGlobals = ismm->GetCGlobals();
return true; return true;
} }

1
extensions/cstrike/extension.h
View File

@ -166,6 +166,7 @@ private:
extern IBinTools *g_pBinTools; extern IBinTools *g_pBinTools;
extern IGameConfig *g_pGameConf; extern IGameConfig *g_pGameConf;
extern ISDKTools *g_pSDKTools; extern ISDKTools *g_pSDKTools;
extern CGlobalVars *gpGlobals;
extern int g_msgHintText; extern int g_msgHintText;
extern bool g_pIgnoreTerminateDetour; extern bool g_pIgnoreTerminateDetour;
extern bool g_pIgnoreCSWeaponDropDetour; extern bool g_pIgnoreCSWeaponDropDetour;

14
extensions/cstrike/timeleft.cpp
View File

@ -58,7 +58,19 @@ void TimeLeftEvents::FireGameEvent(IGameEvent *event)
if (get_new_timeleft_offset || !round_end_found) if (get_new_timeleft_offset || !round_end_found)
{ {
get_new_timeleft_offset = false; get_new_timeleft_offset = false;
timersys->NotifyOfGameStart();
float flGameStartTime = gpGlobals->curtime;
uintptr_t gamerules = (uintptr_t)g_pSDKTools->GetGameRules();
if (gamerules)
{
sm_sendprop_info_t info;
if (gamehelpers->FindSendPropInfo("CCSGameRulesProxy", "m_flGameStartTime", &info))
{
flGameStartTime = *(float *)(gamerules + info.actual_offset);
}
}
timersys->NotifyOfGameStart(flGameStartTime - gpGlobals->curtime);
timersys->MapTimeLeftChanged(); timersys->MapTimeLeftChanged();
} }
round_end_found = false; round_end_found = false;