diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-11-25 15:35:13 -0600 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-11-25 15:35:13 -0600 |
| commit | db34c0af338b8cf04f50b4ade98668869fd303e1 (patch) | |
| tree | e373abe027205c0e8414cf6146ded59112b0ab72 /src/koopatlas/core.h | |
| parent | 72b9b71b5b7fb5757849d19af3dfae21d0ab9c92 (diff) | |
| parent | 1609b49c5c1777e663909b1936b2f8921677f230 (diff) | |
| download | kamek-db34c0af338b8cf04f50b4ade98668869fd303e1.tar.gz kamek-db34c0af338b8cf04f50b4ade98668869fd303e1.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to 'src/koopatlas/core.h')
| -rw-r--r-- | src/koopatlas/core.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/koopatlas/core.h b/src/koopatlas/core.h index 3f795cc..651b628 100644 --- a/src/koopatlas/core.h +++ b/src/koopatlas/core.h @@ -16,6 +16,7 @@ #include "koopatlas/starcoin.h" #include "koopatlas/hud.h" #include "koopatlas/pathmanager.h" +#include "koopatlas/mapmusic.h" #define WM_DEBUGGING //#define WM_SPAMMY_DEBUGGING @@ -39,7 +40,6 @@ void NewerMapDrawFunc(); #define WM_STARCOIN WM_GHOST class daWMPlayer_c; -class daWMSubPlayer_c; class dWMMap_c; class dWMHud_c; class dWMShop_c; @@ -100,7 +100,6 @@ class dScKoopatlas_c : public dScene_c { daWMPlayer_c *player; - daWMSubPlayer_c *subPlayer[3]; dWMHud_c *hud; dWMMap_c *map; dWMShop_c *shop; @@ -117,8 +116,6 @@ class dScKoopatlas_c : public dScene_c { const char *getMapNameForIndex(int index); int getIndexForMapName(const char *name); - nw4r::snd::StrmSoundHandle bgm; - void startLevel(dLevelInfo_c::entry_s *level); bool canDoStuff(); @@ -126,9 +123,7 @@ class dScKoopatlas_c : public dScene_c { void showSaveWindow(); - void playBGM(); - void setBGMTrack(int trackID); - int currentBGMTrack; + bool keepMusicPlaying; }; extern void *_8042A788; |