A lot of clean up.

arx · Apr 3, 2013 · dcb4184 · dcb4184
1 parent 1132cb1
commit dcb4184
Show file tree

Hide file tree

Showing 11 changed files with 589 additions and 460 deletions.
diff --git a/src/core/ArxGame.cpp b/src/core/ArxGame.cpp
@@ -1312,7 +1312,7 @@ void ArxGame::renderLevel() {
 
 	ARX_PLAYER_Manage_Visual();
 
-	ARX_MINIMAP_ValidatePlayerPos();
+	g_miniMap.validatePlayerPos();
 
 	for(size_t i = 0; i < entities.size(); i++) {
 		Entity *entity = entities[i];
@@ -1622,7 +1622,7 @@ void ArxGame::renderLevel() {
 		long SHOWLEVEL = ARX_LEVELS_GetRealNum(CURRENTLEVEL);
 
 		if(SHOWLEVEL >= 0 && SHOWLEVEL < 32)
-			ARX_MINIMAP_Show(SHOWLEVEL, 1, 1);
+			g_miniMap.show(SHOWLEVEL, 1, 1);
 	}
 
 	//-------------------------------------------------------------------------

diff --git a/src/core/Core.cpp b/src/core/Core.cpp
@@ -569,7 +569,7 @@ static bool initializeGame() {
 
 	CalcFPS(true);
 
-	ARX_MAPMARKER_Init();
+	g_miniMap.mapMarkerInit();
 
 	memset(scursor, 0, sizeof(scursor));
 
@@ -655,7 +655,7 @@ static bool initializeGame() {
 	ARXMenu_Options_Control_SetInvertMouse(config.input.invertMouse);
 	ARXMenu_Options_Control_SetMouseSensitivity(config.input.mouseSensitivity);
 
-	ARX_MINIMAP_FirstInit();
+	g_miniMap.firstInit();
 
 	Project.torch = Color3f(1.f, 0.8f, 0.66666f);
 	LogDebug("InitializeDanae");
@@ -3330,7 +3330,7 @@ void shutdownGame() {
 
 	mainApp->getWindow()->hide();
 
-	ARX_MINIMAP_PurgeTC();
+	g_miniMap.purgeTexContainer();
 
 	KillInterfaceTextureContainers();
 	Menu2_Close();

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
@@ -3026,7 +3026,7 @@ void ARX_GAME_Reset(long type) {
 
 	LAST_JUMP_ENDTIME = 0;
 	FlyingOverIO = NULL;
-	ARX_MAPMARKER_Init();
+	g_miniMap.mapMarkerInit();
 	ClearDynLights();
 
 	if(!DONT_ERASE_PLAYER && entities.player()) {
@@ -3160,7 +3160,7 @@ void ARX_GAME_Reset(long type) {
 	// Player Init
 	if (!DONT_ERASE_PLAYER)
 	{
-		ARX_MAPMARKER_Init();
+		g_miniMap.mapMarkerInit();
 		GLOBAL_MAGIC_MODE = 1;
 
 		// Linked Objects

diff --git a/src/game/Spells.cpp b/src/game/Spells.cpp
@@ -7348,7 +7348,7 @@ void MakeSpCol() {
 
 static void ApplyCurSOS() {
 	MakeSpCol();
-	ARX_MINIMAP_Reveal();
+	g_miniMap.reveal();
 	strcpy(sp_max_ch,"!!!_Temple of Elemental Lavis_!!!");
 	sp_max_nb=strlen(sp_max_ch);
 	sp_max_start=arxtime.get_updated();

diff --git a/src/gui/Interface.cpp b/src/gui/Interface.cpp
@@ -786,7 +786,7 @@ void ARX_INTERFACE_BookOpenClose(unsigned long t) // 0 switch 1 forceopen 2 forc
 		ARX_SOUND_PlayInterface(SND_BOOK_CLOSE, 0.9F + 0.2F * rnd());
 		SendIOScriptEvent(entities.player(),SM_BOOK_CLOSE);
 		player.Interface &=~ INTER_MAP;
-		ARX_MINIMAP_PurgeTC();
+		g_miniMap.purgeTexContainer();
 
 		if(ARXmenu.mda) {
 			for(long i = 0; i < MAX_FLYOVER; i++) {
@@ -5284,12 +5284,12 @@ void ARX_INTERFACE_ManageOpenedBook()
 		long SHOWLEVEL = Book_MapPage - 1;
 
 		if (SHOWLEVEL >= 0 && SHOWLEVEL < 32)
-			ARX_MINIMAP_Show( SHOWLEVEL, 0);
+			g_miniMap.show(SHOWLEVEL, 0);
 
 		SHOWLEVEL = ARX_LEVELS_GetRealNum(CURRENTLEVEL);
 
 		if (SHOWLEVEL >= 0 && SHOWLEVEL < 32)
-			ARX_MINIMAP_Show( SHOWLEVEL, 1);
+			g_miniMap.show(SHOWLEVEL, 1);
 
 	}