summaryrefslogtreecommitdiffstats
path: root/sigmod/GlobalScript.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-02-24 13:34:47 -0500
committerBen Boeckel <MathStuf@gmail.com>2009-02-24 13:34:47 -0500
commitecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3 (patch)
tree78058197c6e222a1f5e53874fcf66af2b4887980 /sigmod/GlobalScript.cpp
parent97fac7d7b30058574dc15d7c18382f104bafd833 (diff)
downloadsigen-ecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3.tar.gz
sigen-ecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3.tar.xz
sigen-ecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3.zip
Rename Sigmod::Sigmod to Sigmod::Game so that the identifiers don't clash when using namespace Sigmod
Diffstat (limited to 'sigmod/GlobalScript.cpp')
-rw-r--r--sigmod/GlobalScript.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/sigmod/GlobalScript.cpp b/sigmod/GlobalScript.cpp
index c25239f5..e5651121 100644
--- a/sigmod/GlobalScript.cpp
+++ b/sigmod/GlobalScript.cpp
@@ -23,8 +23,8 @@
#include "GlobalScript.h"
// Sigmod includes
+#include "Game.h"
#include "Macros.h"
-#include "Sigmod.h"
using namespace Sigcore;
using namespace Sigmod;
@@ -35,20 +35,20 @@ GlobalScript::GlobalScript(const GlobalScript& globalScript) :
*this = globalScript;
}
-GlobalScript::GlobalScript(const Sigmod* parent, const int id) :
+GlobalScript::GlobalScript(const Game* parent, const int id) :
Object(parent, id),
m_name(""),
m_script("", "")
{
}
-GlobalScript::GlobalScript(const GlobalScript& globalScript, const Sigmod* parent, const int id) :
+GlobalScript::GlobalScript(const GlobalScript& globalScript, const Game* parent, const int id) :
Object(parent, id)
{
*this = globalScript;
}
-GlobalScript::GlobalScript(const QDomElement& xml, const Sigmod* parent, const int id) :
+GlobalScript::GlobalScript(const QDomElement& xml, const Game* parent, const int id) :
Object(parent, id)
{
LOAD_ID();