summaryrefslogtreecommitdiffstats
path: root/sigencore
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-03-28 14:13:09 -0400
committerBen Boeckel <MathStuf@gmail.com>2009-03-28 14:13:09 -0400
commit24ad4f774f08e4c739b0cb31aa0f07ec8fc67192 (patch)
tree5ad20432e7a2aaf6ed54664fb6d6c2199fcb70fa /sigencore
parenta99fcded51fde93d67e78b8e27cf2ca3046a4f95 (diff)
downloadsigen-24ad4f774f08e4c739b0cb31aa0f07ec8fc67192.tar.gz
sigen-24ad4f774f08e4c739b0cb31aa0f07ec8fc67192.tar.xz
sigen-24ad4f774f08e4c739b0cb31aa0f07ec8fc67192.zip
Move around getters in Client
Diffstat (limited to 'sigencore')
-rw-r--r--sigencore/Client.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/sigencore/Client.cpp b/sigencore/Client.cpp
index b4cb2007..f2bef9b2 100644
--- a/sigencore/Client.cpp
+++ b/sigencore/Client.cpp
@@ -36,11 +36,6 @@ Client::~Client()
{
}
-Arena* Client::arena()
-{
- return m_arena;
-}
-
bool Client::enterArena(Arena* arena)
{
m_arena = arena;
@@ -52,9 +47,9 @@ void Client::exitArena()
m_arena = NULL;
}
-Overworld* Client::world()
+Arena* Client::arena()
{
- return m_world;
+ return m_arena;
}
bool Client::enterWorld(Overworld* world)
@@ -68,6 +63,11 @@ void Client::exitWorld()
m_world = NULL;
}
+Overworld* Client::world()
+{
+ return m_world;
+}
+
bool Client::addCanvas(const QString& name, Canvas* canvas)
{
if (!m_canvases.contains(name))