more minor cleanups

This commit is contained in:
Gered 2013-04-02 12:39:31 -04:00
parent c18ed56011
commit f71d7be30e
8 changed files with 27 additions and 12 deletions

View file

@ -10,6 +10,9 @@ GameProcess::GameProcess(GameState *gameState, ProcessManager *processManager)
: EventListenerEx(gameState->GetGameApp()->GetEventManager()) : EventListenerEx(gameState->GetGameApp()->GetEventManager())
{ {
STACK_TRACE; STACK_TRACE;
ASSERT(gameState != NULL);
ASSERT(processManager != NULL);
m_gameState = gameState; m_gameState = gameState;
m_processManager = processManager; m_processManager = processManager;
m_finished = FALSE; m_finished = FALSE;

View file

@ -14,6 +14,7 @@
GwenGameProcessUIController::GwenGameProcessUIController(GwenGameProcess *gameProcess) GwenGameProcessUIController::GwenGameProcessUIController(GwenGameProcess *gameProcess)
{ {
STACK_TRACE; STACK_TRACE;
ASSERT(gameProcess != NULL);
m_gameProcess = gameProcess; m_gameProcess = gameProcess;
m_canvas = NULL; m_canvas = NULL;
m_inputProcessor = NULL; m_inputProcessor = NULL;

View file

@ -11,6 +11,7 @@
ProcessManager::ProcessManager(GameState *gameState) ProcessManager::ProcessManager(GameState *gameState)
{ {
STACK_TRACE; STACK_TRACE;
ASSERT(gameState != NULL);
m_gameState = gameState; m_gameState = gameState;
} }

View file

@ -40,8 +40,8 @@ public:
void OnUpdate(float delta); void OnUpdate(float delta);
BOOL IsTransitioning() const; BOOL IsTransitioning() const;
BOOL IsEmpty() const { return (m_processes.empty() && m_queue.empty()); } BOOL IsEmpty() const;
BOOL IsTransitioning(const GameProcess *process) const { return GetProcessInfoFor(process)->isTransitioning; } BOOL IsTransitioning(const GameProcess *process) const;
private: private:
void Queue(ProcessInfo *newProcessInfo); void Queue(ProcessInfo *newProcessInfo);
@ -83,5 +83,15 @@ void ProcessManager::RemoveFirst()
StartTransitionOut(itor, TRUE); 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 #endif