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

Revert "Switch internal SM concept of frames to use Think (#1540)" (#1572)

Browse Source 
This reverts commit b383302128.
This commit is contained in:
Asher Baker 2021-08-25 19:59:57 +01:00 committed by Your Name
parent f503139fae
commit a7af242453
3 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
core/TimerSys.cpp
View File

@ -35,7 +35,6 @@
#include "frame_hooks.h"
#include "ConVarManager.h"
#include "logic_bridge.h"
#include <bridge/include/IProviderCallbacks.h>
#define TIMER_MIN_ACCURACY 0.1
@ -171,8 +170,9 @@ void ITimer::Initialize(ITimedEvent *pCallbacks, float fInterval, float fToExec,
TimerSystem::TimerSystem()
{
m_pMapTimer = NULL;
m_bHasMapTickedYet = false;
m_bHasMapSimulatedYet = false;
m_fLastTickedTime = 0.0f;
OnSourceModLevelEnd();
}
TimerSystem::~TimerSystem()
@ -213,28 +213,29 @@ void TimerSystem::OnSourceModLevelEnd()
{
m_bHasMapTickedYet = false;
m_bHasMapSimulatedYet = false;
m_bWasSimulating = false;
m_uFramesAhead = 0;
}
/* Think is called before gpGlobals is updated every frame, even if the server is hibernating */
void TimerSystem::Think(bool unused)
void TimerSystem::GameFrame(bool simulating)
{
m_uFramesAhead++;
bool simulating = m_bWasSimulating && m_uFramesAhead == 1;
if (m_bHasMapTickedYet) {
g_fUniversalTime += gpGlobals->realtime - m_fLastTickedTime;
} else {
if (simulating && m_bHasMapTickedYet)
{
g_fUniversalTime += gpGlobals->curtime - m_fLastTickedTime;
if (!m_bHasMapSimulatedYet)
{
m_bHasMapSimulatedYet = true;
MapTimeLeftChanged();
}
}
else
{
g_fUniversalTime += gpGlobals->interval_per_tick;
}
m_fLastTickedTime = gpGlobals->realtime;
m_fLastTickedTime = gpGlobals->curtime;
m_bHasMapTickedYet = true;
logicore.callbacks->OnThink(simulating);
if (g_fUniversalTime >= g_fTimerThink) {
if (g_fUniversalTime >= g_fTimerThink)
{
RunFrame();
g_fTimerThink = CalcNextThink(g_fTimerThink, TIMER_MIN_ACCURACY);
@ -242,19 +243,9 @@ void TimerSystem::Think(bool unused)
RunFrameHooks(simulating);
m_pOnGameFrame->Execute();
}
/* GameFrame is called after gpGlobals is updated, and may not be called when the server is hibernating */
void TimerSystem::GameFrame(bool simulating)
{
m_bWasSimulating = simulating;
m_uFramesAhead = 0;
if (simulating && !m_bHasMapSimulatedYet)
if (m_pOnGameFrame->GetFunctionCount())
{
m_bHasMapSimulatedYet = true;
MapTimeLeftChanged();
m_pOnGameFrame->Execute(NULL);
}
}

3
core/TimerSys.h
View File

@ -82,7 +82,6 @@ public: //ITimerSystem
public:
void RunFrame();
void RemoveMapChangeTimers();
void Think(bool unused);
void GameFrame(bool simulating);
private:
List<ITimer *> m_SingleTimers;
@ -93,8 +92,6 @@ private:
/* This is stuff for our manual ticking escapades. */
bool m_bHasMapTickedYet; /** Has the map ticked yet? */
bool m_bHasMapSimulatedYet; /** Has the map simulated yet? */
bool m_bWasSimulating; /** Was the last GameFrame simulating */
unsigned m_uFramesAhead; /** Number of frames Think is ahead of GameFrame */
float m_fLastTickedTime; /** Last time that the game currently gave
us while ticking.
*/

6
core/sourcemod.cpp
View File

@ -46,6 +46,7 @@
#include <amtl/os/am-path.h>
#include <bridge/include/IExtensionBridge.h>
#include <bridge/include/IScriptManager.h>
#include <bridge/include/IProviderCallbacks.h>
#include <bridge/include/ILogger.h>
SH_DECL_HOOK6(IServerGameDLL, LevelInit, SH_NOATTRIB, false, bool, const char *, const char *, const char *, const char *, bool, bool);
@ -290,7 +291,6 @@ bool SourceModBase::InitializeSourceMod(char *error, size_t maxlength, bool late
void SourceModBase::StartSourceMod(bool late)
{
SH_ADD_HOOK(IServerGameDLL, LevelShutdown, gamedll, SH_MEMBER(this, &SourceModBase::LevelShutdown), false);
SH_ADD_HOOK(IServerGameDLL, Think, gamedll, SH_MEMBER(&g_Timers, &TimerSystem::Think), false);
SH_ADD_HOOK(IServerGameDLL, GameFrame, gamedll, SH_MEMBER(&g_Timers, &TimerSystem::GameFrame), false);
enginePatch = SH_GET_CALLCLASS(engine);
@ -362,6 +362,8 @@ void SourceModBase::StartSourceMod(bool late)
{
g_pSourcePawn2->InstallWatchdogTimer(atoi(timeout) * 1000);
}
SH_ADD_HOOK(IServerGameDLL, Think, gamedll, SH_MEMBER(logicore.callbacks, &IProviderCallbacks::OnThink), false);
}
static bool g_LevelEndBarrier = false;
@ -596,8 +598,8 @@ void SourceModBase::ShutdownServices()
}
SH_REMOVE_HOOK(IServerGameDLL, LevelShutdown, gamedll, SH_MEMBER(this, &SourceModBase::LevelShutdown), false);
SH_REMOVE_HOOK(IServerGameDLL, Think, gamedll, SH_MEMBER(&g_Timers, &TimerSystem::Think), false);
SH_REMOVE_HOOK(IServerGameDLL, GameFrame, gamedll, SH_MEMBER(&g_Timers, &TimerSystem::GameFrame), false);
SH_REMOVE_HOOK(IServerGameDLL, Think, gamedll, SH_MEMBER(logicore.callbacks, &IProviderCallbacks::OnThink), false);
}
void SourceModBase::LogMessage(IExtension *pExt, const char *format, ...)