thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2024-11-08 00:37:15 +01:00
Code Releases Activity

Move routine processing outside the core class.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2016-05-23 03:54:50 +03:00
parent 86297882d5
commit b9b688581b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/CoreEvents.cpp
View File

@ -8,9 +8,6 @@
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
namespace SqMod { namespace SqMod {
// ------------------------------------------------------------------------------------------------
extern void ProcessRoutines();
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void Core::EmitCustomEvent(Int32 group, Int32 header, Object & payload) void Core::EmitCustomEvent(Int32 group, Int32 header, Object & payload)
{ {
@ -186,9 +183,6 @@ void Core::EmitServerShutdown()
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void Core::EmitServerFrame(Float32 elapsed_time) void Core::EmitServerFrame(Float32 elapsed_time)
{ {
// Update routines
ProcessRoutines();
// Now forward the event
Emit(mOnServerFrame, elapsed_time); Emit(mOnServerFrame, elapsed_time);
} }

4
source/Main.cpp
View File

@ -16,6 +16,7 @@ static Object g_ReloadPayload;
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
extern void InitExports(); extern void InitExports();
extern void ProcessRoutines();
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* Perform a scripts reload at the end of the current event. * Perform a scripts reload at the end of the current event.
@ -178,9 +179,12 @@ static void OnServerFrame(float elapsed_time)
// Attempt to forward the event // Attempt to forward the event
try try
{ {
// Now forward the event
Core::Get().EmitServerFrame(elapsed_time); Core::Get().EmitServerFrame(elapsed_time);
} }
SQMOD_CATCH_EVENT_EXCEPTION(OnServerFrame) SQMOD_CATCH_EVENT_EXCEPTION(OnServerFrame)
// Process routines, if any
ProcessRoutines();
// See if a reload was requested // See if a reload was requested
SQMOD_RELOAD_CHECK(false) SQMOD_RELOAD_CHECK(false)
} }