more minor cleanups

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;

src/processes/gameprocess.h

@@ -43,14 +43,14 @@ public:
 	template<class T> T* As();
 	template<class T> 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; }
+	GameState* GetGameState() const                                             { return m_gameState; }
-	ProcessManager* GetProcessManager() const              { return m_processManager; }
+	ProcessManager* GetProcessManager() const                                   { return m_processManager; }
 
 	void SetFinished();
 

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();

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;

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; }
+	GwenGameProcess* GetGameProcess() const                                     { return m_gameProcess; }
-	Gwen::Controls::Canvas* GetCanvas() const              { return m_canvas; }
+	Gwen::Controls::Canvas* GetCanvas() const                                   { return m_canvas; }
 	
 	void EnableGwenInput(BOOL enable);
 
-	float GetAlpha() const                                 { return m_alpha; }
+	float GetAlpha() const                                                      { return m_alpha; }
-	float GetScale() const                                 { return m_scale; }
+	float GetScale() const                                                      { return m_scale; }
 	void SetAlpha(float alpha);
 	void SetScale(float scale);
 	

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();

src/processes/processmanager.cpp

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

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 IsEmpty() const;
-	BOOL IsTransitioning(const GameProcess *process) const { return GetProcessInfoFor(process)->isTransitioning; }
+	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