From 86aebecbdb2bf110375ebe3dd9da4a431fbcd10b Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 24 Jan 2006 03:53:17 +0000
Subject: [PATCH] namespace

---
 stepmania/src/GameLoop.cpp      | 6 +++---
 stepmania/src/GameLoop.h        | 9 ++++++---
 stepmania/src/ScreenManager.cpp | 4 ++--
 stepmania/src/StepMania.cpp     | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/GameLoop.cpp b/stepmania/src/GameLoop.cpp
index d281b225f5..afcc57c4f5 100644
--- a/stepmania/src/GameLoop.cpp
+++ b/stepmania/src/GameLoop.cpp
@@ -118,7 +118,7 @@ static void CheckFocus()
 	}
 }
 
-void GameLoop()
+void GameLoop::GameLoop()
 {
 	/* People may want to do something else while songs are loading, so do
 	 * this after loading songs. */
@@ -257,13 +257,13 @@ int ConcurrentRenderer::StartRenderThread( void *p )
 	return 0;
 }
 
-void StartConcurrentRendering()
+void GameLoop::StartConcurrentRendering()
 {
 	ASSERT( g_pConcurrentRenderer == NULL );
 	g_pConcurrentRenderer = new ConcurrentRenderer;
 }
 
-void FinishConcurrentRendering()
+void GameLoop::FinishConcurrentRendering()
 {
 	SAFE_DELETE( g_pConcurrentRenderer );
 }
diff --git a/stepmania/src/GameLoop.h b/stepmania/src/GameLoop.h
index b34072c272..8a9b6a93c8 100644
--- a/stepmania/src/GameLoop.h
+++ b/stepmania/src/GameLoop.h
@@ -3,9 +3,12 @@
 #ifndef GAME_LOOP_H
 #define GAME_LOOP_H
 
-void GameLoop();
-void StartConcurrentRendering();
-void FinishConcurrentRendering();
+namespace GameLoop
+{
+	void GameLoop();
+	void StartConcurrentRendering();
+	void FinishConcurrentRendering();
+};
 
 #endif
 
diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index bcc5a63bf1..790bc8133d 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -584,14 +584,14 @@ void ScreenManager::RunConcurrentlyPrepareScreen()
 	if( !ScreenIsPrepped(sScreenName) )
 	{
 		g_bIsConcurrentlyLoading = true;
-		StartConcurrentRendering();
+		GameLoop::StartConcurrentRendering();
 
 		if( g_setGroupedScreens.find(sScreenName) == g_setGroupedScreens.end() )
 			DeletePreparedScreens();
 		
 		PrepareScreen( sScreenName );
 		
-		FinishConcurrentRendering();
+		GameLoop::FinishConcurrentRendering();
 		g_bIsConcurrentlyLoading = false;
 
 		LOG->Trace( "Concurrent prepare of %s finished", sScreenName.c_str() );
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 0a26dabb94..08cb6fc555 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1084,7 +1084,7 @@ int main(int argc, char* argv[])
 		NSMAN->DisplayStartupStatus();	// If we're using networking show what happened
 
 	/* Run the main loop. */
-	GameLoop();
+	GameLoop::GameLoop();
 
 	/* If we ended mid-game, finish up. */
 	GAMESTATE->EndGame();