From 05eb1400faaa957905fbbe8fa284df4ab1472a58 Mon Sep 17 00:00:00 2001 From: Treeki Date: Thu, 20 Sep 2012 15:30:05 +0200 Subject: cleaning up in preparation for the new HUD, plus a few other changes --- src/koopatlas/hud.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/koopatlas/hud.h') diff --git a/src/koopatlas/hud.h b/src/koopatlas/hud.h index 347fcb4..ac7b81e 100644 --- a/src/koopatlas/hud.h +++ b/src/koopatlas/hud.h @@ -15,25 +15,8 @@ class dWMHud_c : public dBase_c { bool layoutLoaded; m2d::EmbedLayout_c layout; - void updateLives(); - - void showPointBar(); - void hidePointBar(); - - void setPointName(); - void checkPointStatus(); - void setLevelText(const char *str, int length = -1); - void setLevelText(const wchar_t *str, int length = -1); - - void setWorldName(); - void setWorldText(const char *str, int length = -1); - void setWorldText(const wchar_t *str, int length = -1); - static dWMHud_c *build(); static dWMHud_c *instance; - - private: - bool isPointBarShown; }; #endif -- cgit v1.2.3 From f21117a1ebb837fec02b42a3808896d6edb4ccf6 Mon Sep 17 00:00:00 2001 From: Treeki Date: Thu, 20 Sep 2012 17:29:47 +0200 Subject: beginnings of the new HUD --- src/koopatlas/hud.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/koopatlas/hud.h') diff --git a/src/koopatlas/hud.h b/src/koopatlas/hud.h index ac7b81e..87f731b 100644 --- a/src/koopatlas/hud.h +++ b/src/koopatlas/hud.h @@ -17,6 +17,13 @@ class dWMHud_c : public dBase_c { static dWMHud_c *build(); static dWMHud_c *instance; + + + bool showingHeader; + + + void playShowHeaderAnim(); + void playHideHeaderAnim(); }; #endif -- cgit v1.2.3 From badb2bf6bc25f47e711fc483e0c551b4fc18759f Mon Sep 17 00:00:00 2001 From: Treeki Date: Fri, 21 Sep 2012 00:08:14 +0200 Subject: fixes, header cleanups, and part of the code for the new HUD --- src/koopatlas/hud.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/koopatlas/hud.h') diff --git a/src/koopatlas/hud.h b/src/koopatlas/hud.h index 87f731b..632a078 100644 --- a/src/koopatlas/hud.h +++ b/src/koopatlas/hud.h @@ -19,11 +19,25 @@ class dWMHud_c : public dBase_c { static dWMHud_c *instance; - bool showingHeader; - + void enteredNode(); + void leftNode(); + private: void playShowHeaderAnim(); void playHideHeaderAnim(); + void loadHeaderInfo(); + + bool willShowHeader; + dKPNode_s *nodeForHeader; + + + nw4r::lyt::Picture *Header_Centre, *Header_Right; + nw4r::lyt::Picture *NormalExitFlag, *SecretExitFlag; + nw4r::lyt::Picture *StarCoinOn[3]; + nw4r::lyt::TextBox *LevelName, *LevelNameS; + nw4r::lyt::TextBox *LevelNumber, *LevelNumberS; + nw4r::lyt::TextBox *WorldName, *WorldNameS; + nw4r::lyt::TextBox *StarCoinCounter; }; #endif -- cgit v1.2.3 From 955831a5bad45d39dfceb4a1741095b5d109b079 Mon Sep 17 00:00:00 2001 From: Treeki Date: Fri, 21 Sep 2012 13:24:57 +0200 Subject: still working on the new HUD... --- src/koopatlas/hud.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/koopatlas/hud.h') diff --git a/src/koopatlas/hud.h b/src/koopatlas/hud.h index 632a078..6f10169 100644 --- a/src/koopatlas/hud.h +++ b/src/koopatlas/hud.h @@ -19,7 +19,7 @@ class dWMHud_c : public dBase_c { static dWMHud_c *instance; - void enteredNode(); + void enteredNode(dKPNode_s *node = 0); void leftNode(); private: -- cgit v1.2.3 From f4be7c3e4a44a6ec870eb61863a3d294da6f10ae Mon Sep 17 00:00:00 2001 From: Treeki Date: Tue, 25 Sep 2012 04:51:03 +0200 Subject: fixed display of lives --- src/koopatlas/hud.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'src/koopatlas/hud.h') diff --git a/src/koopatlas/hud.h b/src/koopatlas/hud.h index 6f10169..07dde77 100644 --- a/src/koopatlas/hud.h +++ b/src/koopatlas/hud.h @@ -22,6 +22,8 @@ class dWMHud_c : public dBase_c { void enteredNode(dKPNode_s *node = 0); void leftNode(); + void setupLives(); + private: void playShowHeaderAnim(); void playHideHeaderAnim(); @@ -31,13 +33,22 @@ class dWMHud_c : public dBase_c { dKPNode_s *nodeForHeader; - nw4r::lyt::Picture *Header_Centre, *Header_Right; - nw4r::lyt::Picture *NormalExitFlag, *SecretExitFlag; - nw4r::lyt::Picture *StarCoinOn[3]; - nw4r::lyt::TextBox *LevelName, *LevelNameS; - nw4r::lyt::TextBox *LevelNumber, *LevelNumberS; - nw4r::lyt::TextBox *WorldName, *WorldNameS; - nw4r::lyt::TextBox *StarCoinCounter; + nw4r::lyt::Pane + *N_IconPosXP_00[4]; + + nw4r::lyt::Picture + *Header_Centre, *Header_Right, + *NormalExitFlag, *SecretExitFlag, + *StarCoinOn[3], + *P_marioFace_00, *P_luigiFace_00, + *P_BkinoFace_00, *P_YkinoFace_00; + + nw4r::lyt::TextBox + *LevelName, *LevelNameS, + *LevelNumber, *LevelNumberS, + *WorldName, *WorldNameS, + *StarCoinCounter, + *T_lifeNumber[4]; }; #endif -- cgit v1.2.3 From 46b65dfd76411bec6f8356c581f337f8a1944013 Mon Sep 17 00:00:00 2001 From: Treeki Date: Tue, 25 Sep 2012 23:03:30 +0200 Subject: added Remocon and GameMgr definitions, and made map HUD buttons work --- src/koopatlas/hud.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/koopatlas/hud.h') diff --git a/src/koopatlas/hud.h b/src/koopatlas/hud.h index 07dde77..e507aea 100644 --- a/src/koopatlas/hud.h +++ b/src/koopatlas/hud.h @@ -18,7 +18,6 @@ class dWMHud_c : public dBase_c { static dWMHud_c *build(); static dWMHud_c *instance; - void enteredNode(dKPNode_s *node = 0); void leftNode(); @@ -32,6 +31,9 @@ class dWMHud_c : public dBase_c { bool willShowHeader; dKPNode_s *nodeForHeader; + int displayedControllerType; + void updatePressableButtonThingies(); + nw4r::lyt::Pane *N_IconPosXP_00[4]; -- cgit v1.2.3