diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-02-24 13:34:47 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-02-24 13:34:47 -0500 |
| commit | ecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3 (patch) | |
| tree | 78058197c6e222a1f5e53874fcf66af2b4887980 /sigmod/MapWarp.cpp | |
| parent | 97fac7d7b30058574dc15d7c18382f104bafd833 (diff) | |
| download | sigen-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/MapWarp.cpp')
| -rw-r--r-- | sigmod/MapWarp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sigmod/MapWarp.cpp b/sigmod/MapWarp.cpp index a251e834..545e63a0 100644 --- a/sigmod/MapWarp.cpp +++ b/sigmod/MapWarp.cpp @@ -23,9 +23,9 @@ #include "MapWarp.h" // Sigmod includes +#include "Game.h" #include "Macros.h" #include "Map.h" -#include "Sigmod.h" using namespace Sigcore; using namespace Sigmod; @@ -119,9 +119,9 @@ CHECK_BEGIN(MapWarp, QRect&, area) TBOUNDS_MOD(area_height, 1, map->height() - area.y(), area.height()); CHECK_END() CHECK(MapWarp, Type, type) -CHECK_INDEX(MapWarp, int, toMap, sigmod(), map) +CHECK_INDEX(MapWarp, int, toMap, game(), map) CHECK_BEGIN(MapWarp, int, toWarp) - const Map* map = sigmod()->mapById(m_toMap); + const Map* map = game()->mapById(m_toMap); if (!map) { EBOUNDS_IDX(m_toMap); |