From a5b7bd275ad894f68a1a4479a112d5a97aede8f4 Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Sat, 18 Jun 2011 01:58:08 +0200
Subject: HUD fixes

---
 src/wm_hud.cpp          |  2 +-
 src/wm_path_manager.cpp |  3 +++
 src/worldmap.cpp        | 11 +++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/wm_hud.cpp b/src/wm_hud.cpp
index f52cf42..aa8a8b4 100644
--- a/src/wm_hud.cpp
+++ b/src/wm_hud.cpp
@@ -47,7 +47,7 @@ int dWMHud_c::onCreate() {
 		layout.disableAllAnimations();
 		layout.enableNonLoopAnim(2);
 
-		//layout.findTextBoxByName("T_area_01")->AllocStringBuffer(100);
+		updateText();
 
 		layoutLoaded = true;
 	}
diff --git a/src/wm_path_manager.cpp b/src/wm_path_manager.cpp
index 1f0b460..f892aca 100644
--- a/src/wm_path_manager.cpp
+++ b/src/wm_path_manager.cpp
@@ -32,6 +32,9 @@ int dWMPathManager_c::onDelete() {
 
 int dWMPathManager_c::onExecute() {
 	if (!dScNewerWorldMap_c::instance->canDoStuff()) return true;
+	// A HACK
+	// TODO: fix this / make it cleaner
+	if (dScNewerWorldMap_c::instance->state != 6) return true;
 
 	int heldButtons = Remocon_GetButtons(GetActiveRemocon());
 	int nowPressed = Remocon_GetPressed(GetActiveRemocon());
diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 50e82c7..06229e0 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -413,7 +413,11 @@ int dScNewerWorldMap_c::onExecute() {
 			if (nowPressed & WPAD_ONE) {
 				STKI_SHOW(this->stockItem) = true;
 				this->state = STATE_POWERUPS_WAIT;
+			} else if (nowPressed & WPAD_PLUS) {
+				CSMENU_ACTIVE(this->csMenu) = true;
+				this->state = STATE_CSMENU;
 			}
+
 		} break;
 
 		/**********************************************************************/
@@ -815,9 +819,6 @@ void NewerMapDrawFunc() {
 	// Todo: Newer-specific scenes?
 
 	// Stage 1
-	SetupLYTDrawing();
-	DrawAllLayoutsBeforeX(129);
-	GXDrawDone(); // is all GXDrawDone really needed..?
 
 	// Stage 2
 	Reset3DState();
@@ -838,7 +839,9 @@ void NewerMapDrawFunc() {
 	// Stage 3
 	Reset3DState();
 	SetupLYTDrawing();
-	DrawAllLayoutsAfterXandBeforeY(128, 146);
+	DrawAllLayoutsBeforeX(146);
+	//DrawAllLayoutsBeforeX(129);
+	//DrawAllLayoutsAfterXandBeforeY(128, 146);
 	GXDrawDone();
 
 	// Stage 4
-- 
cgit v1.2.3