MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Rename 'GlobalState' to 'SharedState' to avoid confusion with GLState

Browse source 
This was particularly nasty with the shorthand macros
'gState' and 'glState'. The former is now 'shState'.
This commit is contained in:
Jonas Kulla 2013-10-09 12:30:33 +02:00
parent 807bee5748
commit cb6f73f7df
32 changed files with 222 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

14
binding-mri/binding-mri.cpp
View file

@ -21,7 +21,7 @@
#include "binding.h"
#include "binding-util.h"
#include "globalstate.h"
#include "sharedstate.h"
#include "eventthread.h"
#include "filesystem.h"
@ -101,7 +101,7 @@ static void mriBindingInit()
static void
showMsg(const QByteArray &msg)
{
gState->eThread().showMessageBox(msg.constData());
shState->eThread().showMessageBox(msg.constData());
}
static void printP(int argc, VALUE *argv,
@ -185,7 +185,7 @@ struct Script
static void runRMXPScripts()
{
const QByteArray &scriptPack = gState->rtData().config.game.scripts;
const QByteArray &scriptPack = shState->rtData().config.game.scripts;
if (scriptPack.isEmpty())
{
@ -193,7 +193,7 @@ static void runRMXPScripts()
return;
}
if (!gState->fileSystem().exists(scriptPack.constData()))
if (!shState->fileSystem().exists(scriptPack.constData()))
{
showMsg("Unable to open '" + scriptPack + "'");
return;
@ -290,11 +290,11 @@ static void mriBindingExecute()
ruby_setup();
RbData rbData;
gState->setBindingData(&rbData);
shState->setBindingData(&rbData);
mriBindingInit();
QByteArray &customScript = gState->rtData().config.customScript;
QByteArray &customScript = shState->rtData().config.customScript;
if (!customScript.isEmpty())
runCustomScript(customScript.constData());
else
@ -315,7 +315,7 @@ static void mriBindingExecute()
ruby_cleanup(0);
gState->rtData().rqTermAck = true;
shState->rtData().rqTermAck = true;
}
static void mriBindingTerminate()