From f71d7be30e3a892d132ee3f2e8f44d398c4208e1 Mon Sep 17 00:00:00 2001 From: gered Date: Tue, 2 Apr 2013 12:39:31 -0400 Subject: [PATCH] more minor cleanups --- src/processes/gameprocess.cpp | 3 +++ src/processes/gameprocess.h | 8 ++++---- src/processes/gwengameprocess.h | 2 +- src/processes/gwengameprocessuicontroller.cpp | 1 + src/processes/gwengameprocessuicontroller.h | 8 ++++---- src/processes/processinfo.h | 2 +- src/processes/processmanager.cpp | 1 + src/processes/processmanager.h | 14 ++++++++++++-- 8 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/processes/gameprocess.cpp b/src/processes/gameprocess.cpp index 5a53499..fdbeea0 100644 --- a/src/processes/gameprocess.cpp +++ b/src/processes/gameprocess.cpp @@ -10,6 +10,9 @@ GameProcess::GameProcess(GameState *gameState, ProcessManager *processManager) : EventListenerEx(gameState->GetGameApp()->GetEventManager()) { STACK_TRACE; + ASSERT(gameState != NULL); + ASSERT(processManager != NULL); + m_gameState = gameState; m_processManager = processManager; m_finished = FALSE; diff --git a/src/processes/gameprocess.h b/src/processes/gameprocess.h index 425823a..d48287a 100644 --- a/src/processes/gameprocess.h +++ b/src/processes/gameprocess.h @@ -43,14 +43,14 @@ public: template T* As(); template const T* As() const; - GameApp* GetGameApp() const { return m_gameState->GetGameApp(); } + GameApp* GetGameApp() const { return m_gameState->GetGameApp(); } - BOOL IsFinished() const { return m_finished; } + BOOL IsFinished() const { return m_finished; } BOOL IsTransitioning() const; protected: - GameState* GetGameState() const { return m_gameState; } - ProcessManager* GetProcessManager() const { return m_processManager; } + GameState* GetGameState() const { return m_gameState; } + ProcessManager* GetProcessManager() const { return m_processManager; } void SetFinished(); diff --git a/src/processes/gwengameprocess.h b/src/processes/gwengameprocess.h index add7069..20b2e67 100644 --- a/src/processes/gwengameprocess.h +++ b/src/processes/gwengameprocess.h @@ -19,7 +19,7 @@ public: static GAMEPROCESS_TYPE typeName = "GwenGameProcess"; return typeName; } - GAMEPROCESS_TYPE GetTypeOf() const { return GetType(); } + GAMEPROCESS_TYPE GetTypeOf() const { return GetType(); } GwenGameProcess(GameState *gameState, ProcessManager *processManager); virtual ~GwenGameProcess(); diff --git a/src/processes/gwengameprocessuicontroller.cpp b/src/processes/gwengameprocessuicontroller.cpp index 8d7f8a0..d015489 100644 --- a/src/processes/gwengameprocessuicontroller.cpp +++ b/src/processes/gwengameprocessuicontroller.cpp @@ -14,6 +14,7 @@ GwenGameProcessUIController::GwenGameProcessUIController(GwenGameProcess *gameProcess) { STACK_TRACE; + ASSERT(gameProcess != NULL); m_gameProcess = gameProcess; m_canvas = NULL; m_inputProcessor = NULL; diff --git a/src/processes/gwengameprocessuicontroller.h b/src/processes/gwengameprocessuicontroller.h index 3b266d5..29df84a 100644 --- a/src/processes/gwengameprocessuicontroller.h +++ b/src/processes/gwengameprocessuicontroller.h @@ -59,13 +59,13 @@ protected: Gwen::Controls::Canvas* InitializeGwen(const stl::string &skinFilename, const stl::string &fontFilename, uint8_t fontSize); void ResizeAndScaleCanvas(); - GwenGameProcess* GetGameProcess() const { return m_gameProcess; } - Gwen::Controls::Canvas* GetCanvas() const { return m_canvas; } + GwenGameProcess* GetGameProcess() const { return m_gameProcess; } + Gwen::Controls::Canvas* GetCanvas() const { return m_canvas; } void EnableGwenInput(BOOL enable); - float GetAlpha() const { return m_alpha; } - float GetScale() const { return m_scale; } + float GetAlpha() const { return m_alpha; } + float GetScale() const { return m_scale; } void SetAlpha(float alpha); void SetScale(float scale); diff --git a/src/processes/processinfo.h b/src/processes/processinfo.h index e62beac..bd55ded 100644 --- a/src/processes/processinfo.h +++ b/src/processes/processinfo.h @@ -19,7 +19,7 @@ struct ProcessInfo BOOL isInactive; BOOL isBeingRemoved; - const stl::string& GetDescriptor() const { return m_descriptor; } + const stl::string& GetDescriptor() const { return m_descriptor; } private: void SetDescriptor(); diff --git a/src/processes/processmanager.cpp b/src/processes/processmanager.cpp index 839f57e..570e1ae 100644 --- a/src/processes/processmanager.cpp +++ b/src/processes/processmanager.cpp @@ -11,6 +11,7 @@ ProcessManager::ProcessManager(GameState *gameState) { STACK_TRACE; + ASSERT(gameState != NULL); m_gameState = gameState; } diff --git a/src/processes/processmanager.h b/src/processes/processmanager.h index 70bdd09..bca9fdc 100644 --- a/src/processes/processmanager.h +++ b/src/processes/processmanager.h @@ -40,8 +40,8 @@ public: void OnUpdate(float delta); BOOL IsTransitioning() const; - BOOL IsEmpty() const { return (m_processes.empty() && m_queue.empty()); } - BOOL IsTransitioning(const GameProcess *process) const { return GetProcessInfoFor(process)->isTransitioning; } + BOOL IsEmpty() const; + BOOL IsTransitioning(const GameProcess *process) const; private: void Queue(ProcessInfo *newProcessInfo); @@ -83,5 +83,15 @@ void ProcessManager::RemoveFirst() StartTransitionOut(itor, TRUE); } +inline BOOL ProcessManager::IsEmpty() const +{ + return (m_processes.empty() && m_queue.empty()); +} + +inline BOOL ProcessManager::IsTransitioning(const GameProcess *process) const +{ + return GetProcessInfoFor(process)->isTransitioning; +} + #endif