diff --git a/data/DataCache.scr b/data/DataCache.scr index 6ac46cef2..de340b389 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -152,6 +152,8 @@ levels/CHAPTER06_LEVEL05.Tex levels/FMA_SHADYSHOALS.Lvl levels/FMA_SHADYSHOALS.Tex +levels/FMA_CONTROLROOM.Lvl +levels/FMA_CONTROLROOM.Tex actors/SPONGEBOB.SBK actors/SPONGEBOB_CORALBLOWER.SBK diff --git a/makefile.gfx b/makefile.gfx index 5d806edfe..a9151bc07 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -53,7 +53,7 @@ LEVELS_CHAPTER03 := LEVEL01 LEVEL02 LEVEL03 LEVEL04 LEVELS_CHAPTER04 := LEVEL01 LEVEL02 LEVEL03 LEVEL04 LEVELS_CHAPTER05 := LEVEL01 LEVEL02 LEVEL03 LEVEL04 LEVELS_CHAPTER06 := LEVEL01 LEVEL02 LEVEL03 LEVEL04 LEVEL05 -LEVELS_FMA := SHADYSHOALS +LEVELS_FMA := SHADYSHOALS CONTROLROOM LEVELS_MAKEFILES := $(foreach CHAPTER,$(LEVELS_CHAPTERS),$(foreach LEVEL,$(LEVELS_$(CHAPTER)),$(LEVELS_MAKEFILE_DIR)/$(CHAPTER)_$(LEVEL).mak)) diff --git a/source/level/level.cpp b/source/level/level.cpp index ed2215bee..5ac44ce96 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -163,6 +163,7 @@ {5,5, CHAPTER06_LEVEL05_INF_TOTAL_ITEM_KELP_TOKEN, LEVELS_CHAPTER06_LEVEL05_LVL,LEVELS_CHAPTER06_LEVEL05_TEX, CSoundMediator::SONG_CHAPTER6_TUNNELOFLOVE, STR__KELP_WORLD,STR__CHAPTER_6_LEVEL_5 }, // FMA {6,0, 0, LEVELS_FMA_SHADYSHOALS_LVL,LEVELS_FMA_SHADYSHOALS_TEX, CSoundMediator::SONG_TITLE, STR__NOW_LOADING,STR__NOW_LOADING }, + {6,0, 0, LEVELS_FMA_CONTROLROOM_LVL,LEVELS_FMA_CONTROLROOM_TEX, CSoundMediator::SONG_TITLE, STR__NOW_LOADING,STR__NOW_LOADING }, }; const int LvlTableSize=sizeof(LvlTable)/sizeof(sLvlTab);