diff options
Diffstat (limited to 'src/koopatlas/core.cpp')
| -rw-r--r-- | src/koopatlas/core.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp index 42bf7c1..6dba268 100644 --- a/src/koopatlas/core.cpp +++ b/src/koopatlas/core.cpp @@ -17,6 +17,7 @@ CREATE_STATE_E(dScKoopatlas_c, TitleConfirmHitWait); CREATE_STATE_E(dScKoopatlas_c, PlayerChangeWait); CREATE_STATE_E(dScKoopatlas_c, EasyPairingWait); CREATE_STATE_E(dScKoopatlas_c, PowerupsWait); +CREATE_STATE_E(dScKoopatlas_c, ShopWait); CREATE_STATE_E(dScKoopatlas_c, SaveOpen); CREATE_STATE_E(dScKoopatlas_c, SaveSelect); CREATE_STATE_E(dScKoopatlas_c, SaveWindowClose); @@ -142,6 +143,15 @@ bool WMInit_LoadSIAnims(void *ptr) { DVD_LoadFile(GetDVDClass(), "WorldMap", "SI_star", 0); DVD_LoadFile(GetDVDClass(), "Object", "I_hammer", 0); DVD_LoadFile(GetDVDClass(), "Object", "cobCourse", 0); + DVD_LoadFile(GetDVDClass(), "Object", "obj_coin", 0); + DVD_LoadFile(GetDVDClass(), "Object", "I_kinoko", 0); + DVD_LoadFile(GetDVDClass(), "Object", "I_fireflower", 0); + DVD_LoadFile(GetDVDClass(), "Object", "I_iceflower", 0); + DVD_LoadFile(GetDVDClass(), "Object", "I_penguin", 0); + DVD_LoadFile(GetDVDClass(), "Object", "I_propeller", 0); + DVD_LoadFile(GetDVDClass(), "Object", "I_star", 0); + DVD_LoadFile(GetDVDClass(), "Object", "I_kinoko_bundle", 0); + DVD_LoadFile(GetDVDClass(), "Object", "lakitu", 0); return true; } @@ -246,6 +256,10 @@ bool WMInit_SetupExtra(void *ptr) { // because we require it earlier // it is created in dScKoopatlas_c::onCreate + SpammyReport("creating SHOP\n"); + wm->shop = (dWMShop_c*)CreateParentedObject(WM_SHOP, wm, 0, 0); + + SpammyReport("SetupExtra done\n"); return true; @@ -649,6 +663,17 @@ void dScKoopatlas_c::executeState_PowerupsWait() { } + +/**********************************************************************/ +// STATE_ShopWait : Wait for the user to exit the Shop screen. +void dScKoopatlas_c::executeState_ShopWait() { + + if (shop->isHidden) { + state.setState(&StateID_Normal); + } + +} + /**********************************************************************/ // STATE_SaveOpen : Waiting for the "Save?" YesNoWindow to open void dScKoopatlas_c::executeState_SaveOpen() { |