diff --git a/data/DataCache.scr b/data/DataCache.scr index 54ba36306..6668df154 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -224,6 +224,7 @@ actors/SPONGEBOB_FMA.SBK actors/SPONGEBOB_FMA_ITEMOFS.SBK actors/BARNACLEBOY.SBK +actors/BARNACLEBOY_FMA_ITEMOFS.SBK actors/KRUSTY.SBK actors/SQUIDWARD.SBK actors/GARY.SBK diff --git a/makefile.gfx b/makefile.gfx index 48233a724..579fcd716 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -108,7 +108,7 @@ ACTOR_DIRS_TO_MAKE := $(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR) MKACTOR_OPTS:= -c:16 ACTOR_SPONGEBOB := SpongeBob SpongeBob_CoralBlower SpongeBob_JellyLauncher SpongeBob_Net SpongeBob_Glove SpongeBob_Wand SpongeBob_JellyFish SpongeBob_FMA SpongeBob_FMA_ITEMOFS -ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan MermaidMan_FMA_ITEMOFS +ACTOR_NPC := BarnacleBoy BarnacleBoy_FMA_ITEMOFS Krusty Squidward Gary Sandy Patrick MermaidMan MermaidMan_FMA_ITEMOFS ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil \ Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish \ diff --git a/source/fma/fma.cpp b/source/fma/fma.cpp index 0d178fdad..2344ec3ce 100644 --- a/source/fma/fma.cpp +++ b/source/fma/fma.cpp @@ -104,6 +104,7 @@ FX #ifndef __ANIM_BARNACLEBOY_HEADER__ #include "actor_barnacleboy_anim.h" #endif +#include "actor_barnacleboy_fma_itemofs_anim.h" #ifndef __ANIM_GARY_HEADER__ #include "actor_gary_anim.h" @@ -338,13 +339,13 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= { // SpongeBob {ACTORS_SPONGEBOB_SBK,ACTORS_SPONGEBOB_FMA_SBK,ACTORS_SPONGEBOB_FMA_ITEMOFS_SBK}, { -/*FMA_ANIM_IDLE*/ {0,ANIM_SPONGEBOB_IDLEBREATH, 0,-1}, +/*FMA_ANIM_IDLE*/ {0,ANIM_SPONGEBOB_IDLEBREATH, 2,ANIM_SPONGEBOB_FMA_ITEMOFS_IDLEBREATH}, /*FMA_ANIM_WALK*/ {0,ANIM_SPONGEBOB_RUN, 2,ANIM_SPONGEBOB_FMA_ITEMOFS_RUN}, /*FMA_ANIM_FIXTV*/ {1,ANIM_SPONGEBOB_FMA_FIXTV, 0,-1}, /*FMA_ANIM_GIVEEND*/ {1,ANIM_SPONGEBOB_FMA_GIVEEND, 0,-1}, /*FMA_ANIM_GIVESTART*/ {1,ANIM_SPONGEBOB_FMA_GIVESTART, 0,-1}, /*FMA_ANIM_IDEA*/ {1,ANIM_SPONGEBOB_FMA_IDEA, 0,-1}, -/*FMA_ANIM_QUICKEXIT*/ {1,ANIM_SPONGEBOB_FMA_QUICKEXIT, 0,-1}, +/*FMA_ANIM_QUICKEXIT*/ {1,ANIM_SPONGEBOB_FMA_QUICKEXIT, 2,ANIM_SPONGEBOB_FMA_ITEMOFS_QUICKEXIT}, /*FMA_ANIM_SHOUT*/ {1,ANIM_SPONGEBOB_FMA_SHOUT, 0,-1}, /*FMA_ANIM_STUMBLE*/ {1,ANIM_SPONGEBOB_FMA_STUMBLE, 2,ANIM_SPONGEBOB_FMA_ITEMOFS_STUMBLE}, /*FMA_ANIM_THROW*/ {1,ANIM_SPONGEBOB_FMA_THROW, 0,-1}, @@ -358,9 +359,9 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= }, }, { // Barnicle Boy - {ACTORS_BARNACLEBOY_SBK, (FileEquate)0,(FileEquate)0}, + {ACTORS_BARNACLEBOY_SBK,ACTORS_BARNACLEBOY_FMA_ITEMOFS_SBK,(FileEquate)0}, { -/*FMA_ANIM_IDLE*/ {0,ANIM_BARNACLEBOY_IDLE, 0,-1}, +/*FMA_ANIM_IDLE*/ {0,ANIM_BARNACLEBOY_IDLE, 1,ANIM_BARNACLEBOY_FMA_ITEMOFS_IDLE}, /*FMA_ANIM_WALK*/ {0,-1, 0,-1}, /*FMA_ANIM_FIXTV*/ {0,-1, 0,-1}, /*FMA_ANIM_GIVEEND*/ {0,ANIM_BARNACLEBOY_GIVEEND, 0,-1}, @@ -371,12 +372,12 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= /*FMA_ANIM_STUMBLE*/ {0,-1, 0,-1}, /*FMA_ANIM_THROW*/ {0,-1, 0,-1}, /*FMA_ANIM_HIDE*/ {0,ANIM_BARNACLEBOY_HIDE, 0,-1}, -/*FMA_ANIM_UNHIDE*/ {0,ANIM_BARNACLEBOY_UNHIDE, 0,-1}, +/*FMA_ANIM_UNHIDE*/ {0,ANIM_BARNACLEBOY_UNHIDE, 1,ANIM_BARNACLEBOY_FMA_ITEMOFS_UNHIDE}, /*FMA_ANIM_UNHIDEIDLE*/ {0,ANIM_BARNACLEBOY_UNHIDEIDLE, 0,-1}, /*FMA_ANIM_SIT*/ {0,ANIM_BARNACLEBOY_SIT, 0,-1}, -/*FMA_ANIM_SITLOOKLEFT*/ {0,ANIM_BARNACLEBOY_SITLOOKLEFT, 0,-1}, +/*FMA_ANIM_SITLOOKLEFT*/ {0,ANIM_BARNACLEBOY_SITLOOKLEFT, 1,ANIM_BARNACLEBOY_FMA_ITEMOFS_SITLOOKLEFT}, /*FMA_ANIM_SITASLEEP*/ {0,ANIM_BARNACLEBOY_SITASLEEP, 0,-1}, -/*FMA_ANIM_RUBHEAD*/ {0,ANIM_BARNACLEBOY_RUBHEAD, 0,-1}, +/*FMA_ANIM_RUBHEAD*/ {0,ANIM_BARNACLEBOY_RUBHEAD, 1,ANIM_BARNACLEBOY_FMA_ITEMOFS_RUBHEAD}, }, }, { // Mermaid Man diff --git a/source/frontend/start.cpp b/source/frontend/start.cpp index 3d86ae268..6dcb048af 100644 --- a/source/frontend/start.cpp +++ b/source/frontend/start.cpp @@ -260,12 +260,6 @@ void CFrontEndStart::render() m_createdSlotGuiFrame->render(); break; } - -#ifdef __USER_paul__ -char buf[100]; -sprintf(buf,"slot %d",m_selectedSlot); -m_font->print(65,7,buf); -#endif } /*---------------------------------------------------------------------- @@ -282,6 +276,7 @@ void CFrontEndStart::drawGameSlot(int _xOff,int _slotNumber) int x,y; sFrameHdr *fh; int i; + char buf[100]; xbase=_xOff+SLOT_FRAME_X; CGameSlotManager::setActiveSlot(_slotNumber); @@ -294,10 +289,14 @@ void CFrontEndStart::drawGameSlot(int _xOff,int _slotNumber) setSemiTrans(f4,true); AddPrimToList(f4,3); + x=xbase+SLOT_SLOTNUMBER_X; + y=SLOT_FRAME_Y+SLOT_SLOTNUMBER_Y; + sprintf(buf,TranslationDatabase::getString(STR__SLOT_SELECT_SCREEN__SLOT_NUMBER),_slotNumber+1,4); + m_font->print(x,y,buf); + if(gameSlot->m_isInUse) { int chapter,level; - char buf[100]; gameSlot->getHighestLevelOpen(&chapter,&level); sprintf(buf,TranslationDatabase::getString(STR__SLOT_SELECT_SCREEN__LEVEL_REACHED),chapter+1,level+1); diff --git a/source/frontend/start.h b/source/frontend/start.h index b6a66b474..eca566394 100644 --- a/source/frontend/start.h +++ b/source/frontend/start.h @@ -59,13 +59,15 @@ private: SLOT_FRAME_Y=30, SLOT_FRAME_W=416, SLOT_FRAME_H=64, - SLOT_LEVEL_TEXT_X=15, + SLOT_LEVEL_TEXT_X=145, SLOT_LEVEL_TEXT_Y=5, SLOT_ITEM_X=16, SLOT_ITEM_Y=25, SLOT_ITEM_YGAP=50, - SLOT_TOKENCOUNT_X=250, + SLOT_TOKENCOUNT_X=275, SLOT_TOKENCOUNT_Y=5, + SLOT_SLOTNUMBER_X=15, + SLOT_SLOTNUMBER_Y=5, SLOT_EMPTYTEXT_X=416/2, SLOT_EMPTYTEXT_Y=15,