From 014f3668eb47b1576bdc182b1db00417f9938cf1 Mon Sep 17 00:00:00 2001 From: Treeki Date: Thu, 27 Sep 2012 00:51:43 +0200 Subject: added untested support for world change nodes --- src/koopatlas/hud.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/koopatlas/hud.h') diff --git a/src/koopatlas/hud.h b/src/koopatlas/hud.h index e507aea..deac84f 100644 --- a/src/koopatlas/hud.h +++ b/src/koopatlas/hud.h @@ -21,11 +21,13 @@ class dWMHud_c : public dBase_c { void enteredNode(dKPNode_s *node = 0); void leftNode(); + void hideAndShowFooter(); + void setupLives(); private: - void playShowHeaderAnim(); - void playHideHeaderAnim(); + void playShowAnim(int id); + void playHideAnim(int id); void loadHeaderInfo(); bool willShowHeader; @@ -34,6 +36,9 @@ class dWMHud_c : public dBase_c { int displayedControllerType; void updatePressableButtonThingies(); + void loadFooterInfo(); + bool willShowFooter; + nw4r::lyt::Pane *N_IconPosXP_00[4]; -- cgit v1.2.3 From 411c5a8e210b5cbca330a5438e2406dbe1ffecab Mon Sep 17 00:00:00 2001 From: Treeki Date: Thu, 27 Sep 2012 04:40:34 +0200 Subject: made world changes work, and HUD colourising and other fun things --- src/koopatlas/hud.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'src/koopatlas/hud.h') diff --git a/src/koopatlas/hud.h b/src/koopatlas/hud.h index deac84f..c0079af 100644 --- a/src/koopatlas/hud.h +++ b/src/koopatlas/hud.h @@ -3,6 +3,23 @@ #include "koopatlas/core.h" +// Colourises an IA8 texture +class dTexMapColouriser_c { + public: + dTexMapColouriser_c(); + ~dTexMapColouriser_c(); + + void resetAndClear(); + void setTexMap(nw4r::lyt::TexMap *tm); + void applyAlso(nw4r::lyt::TexMap *tm); + void colourise(int h, int s, int l); + + private: + nw4r::lyt::TexMap *texmap; + u16 *original; + u16 *mine; +}; + class dWMHud_c : public dBase_c { public: dWMHud_c(); @@ -39,12 +56,14 @@ class dWMHud_c : public dBase_c { void loadFooterInfo(); bool willShowFooter; + dTexMapColouriser_c headerCol, footerCol; + nw4r::lyt::Pane *N_IconPosXP_00[4]; nw4r::lyt::Picture - *Header_Centre, *Header_Right, + *Header_Centre, *Header_Right, *Footer, *NormalExitFlag, *SecretExitFlag, *StarCoinOn[3], *P_marioFace_00, *P_luigiFace_00, -- cgit v1.2.3 From 81ef1a8b7f7d63c72b92f779d73a8b2b0f8158c1 Mon Sep 17 00:00:00 2001 From: Treeki Date: Thu, 27 Sep 2012 23:29:46 +0200 Subject: new levelinfo format and a couple of fixes --- 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 c0079af..05ad07c 100644 --- a/src/koopatlas/hud.h +++ b/src/koopatlas/hud.h @@ -38,7 +38,8 @@ class dWMHud_c : public dBase_c { void enteredNode(dKPNode_s *node = 0); void leftNode(); - void hideAndShowFooter(); + void hideFooter(); + void showFooter(); void setupLives(); @@ -55,6 +56,7 @@ class dWMHud_c : public dBase_c { void loadFooterInfo(); bool willShowFooter; + bool isFooterVisible; dTexMapColouriser_c headerCol, footerCol; -- cgit v1.2.3 From 324f2f2b3b8dff9c6b9c297390c8307d181dac87 Mon Sep 17 00:00:00 2001 From: Treeki Date: Fri, 28 Sep 2012 02:14:22 +0200 Subject: various fixes to stuff on map HUD --- src/koopatlas/hud.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/koopatlas/hud.h') diff --git a/src/koopatlas/hud.h b/src/koopatlas/hud.h index 05ad07c..5996b88 100644 --- a/src/koopatlas/hud.h +++ b/src/koopatlas/hud.h @@ -67,6 +67,7 @@ class dWMHud_c : public dBase_c { nw4r::lyt::Picture *Header_Centre, *Header_Right, *Footer, *NormalExitFlag, *SecretExitFlag, + *StarCoinOff[3], *StarCoinOn[3], *P_marioFace_00, *P_luigiFace_00, *P_BkinoFace_00, *P_YkinoFace_00; -- cgit v1.2.3