From 996c43b8e327a2d63f99c4f5a2d820dbaf1be8f3 Mon Sep 17 00:00:00 2001 From: Treeki Date: Thu, 22 Nov 2012 23:12:30 +0100 Subject: new map music system --- src/koopatlas/core.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/koopatlas/core.h') diff --git a/src/koopatlas/core.h b/src/koopatlas/core.h index 3f795cc..2333c1a 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 @@ -117,8 +118,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 +125,7 @@ class dScKoopatlas_c : public dScene_c { void showSaveWindow(); - void playBGM(); - void setBGMTrack(int trackID); - int currentBGMTrack; + bool keepMusicPlaying; }; extern void *_8042A788; -- cgit v1.2.3 From e37a44245428c5809de867f20c6473c71c05b154 Mon Sep 17 00:00:00 2001 From: Treeki Date: Sat, 24 Nov 2012 04:51:54 +0100 Subject: removed 4P on map --- src/koopatlas/core.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/koopatlas/core.h') diff --git a/src/koopatlas/core.h b/src/koopatlas/core.h index 2333c1a..651b628 100644 --- a/src/koopatlas/core.h +++ b/src/koopatlas/core.h @@ -40,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; @@ -101,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; -- cgit v1.2.3