diff --git a/makefile.gfx b/makefile.gfx index ad46cfa33..d14c29126 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -248,7 +248,7 @@ UI_GFX_TRANS := +bambootopleft.bmp +bamboobotleft.bmp +bambootopright.bmp +ba +mappointer.bmp +speechbubblecorner.bmp \ faces/mr_krabs.bmp faces/patrick.bmp faces/plankton.bmp \ faces/sandy.bmp faces/spongebob.bmp faces/squidward.bmp \ - faces/mermaidman.bmp faces/barnacleboy.bmp faces/jack_custard.bmp + faces/mermaidman.bmp faces/barnacleboy.bmp faces/jack_custard.bmp faces/gary.bmp UI_GFX_TRANS_IN := $(foreach FILE,$(UI_GFX_TRANS),$(UI_GFX_DIR)/$(FILE)) #### diff --git a/source/level/level.cpp b/source/level/level.cpp index a8b170f62..7c344ab5d 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -162,8 +162,8 @@ {5,4, CHAPTER05_LEVEL04_INF_TOTAL_ITEM_GOLDEN_SPATULA, LEVELS_CHAPTER05_LEVEL04_LVL,LEVELS_CHAPTER05_LEVEL04_TEX, CSoundMediator::SONG_CHAPTER5_LEVEL4, STR__CHAPTER_5,STR__CHAPTER_5_LEVEL_4, CFmaScene::FMA_SCRIPT__CH5FINISHED }, {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, CFmaScene::FMA_SCRIPT__NONE }, // FMA - {6,0, 0, LEVELS_FMA_SHADYSHOALS_LVL,LEVELS_FMA_SHADYSHOALS_TEX, CSoundMediator::SONG_TITLE, STR__NOW_LOADING,STR__NOW_LOADING , CFmaScene::FMA_SCRIPT__NONE }, - {6,0, 0, LEVELS_FMA_CONTROLROOM_LVL,LEVELS_FMA_CONTROLROOM_TEX, CSoundMediator::SONG_TITLE, STR__NOW_LOADING,STR__NOW_LOADING , CFmaScene::FMA_SCRIPT__NONE }, + {6,0, 0, LEVELS_FMA_SHADYSHOALS_LVL,LEVELS_FMA_SHADYSHOALS_TEX, CSoundMediator::SONG_TITLE, STR__NOW_LOADING,STR__BLANK, CFmaScene::FMA_SCRIPT__NONE }, + {6,0, 0, LEVELS_FMA_CONTROLROOM_LVL,LEVELS_FMA_CONTROLROOM_TEX, CSoundMediator::SONG_TITLE, STR__NOW_LOADING,STR__BLANK, CFmaScene::FMA_SCRIPT__NONE }, }; const int LvlTableSize=sizeof(LvlTable)/sizeof(sLvlTab);