diff --git a/source/game/gameslot.cpp b/source/game/gameslot.cpp index b626cb209..755c99189 100644 --- a/source/game/gameslot.cpp +++ b/source/game/gameslot.cpp @@ -173,7 +173,7 @@ void CGameSlotManager::eraseGameSlot(unsigned int _slot) } #ifdef __USER_paul__ - slot->m_kelpTokensHeld=82; + slot->m_kelpTokensHeld=125; #else slot->m_kelpTokensHeld=0; #endif diff --git a/source/game/pause.cpp b/source/game/pause.cpp index 378623ccd..63b328b06 100644 --- a/source/game/pause.cpp +++ b/source/game/pause.cpp @@ -367,6 +367,7 @@ void CPauseMenu::renderLives() gameSlot=CGameSlotManager::getSlotData(); +/* // Spat count x=100; y=137; @@ -378,6 +379,7 @@ void CPauseMenu::renderLives() textYOff=fh->H-m_fontBank->getStringHeight(buf); y+=textYOff; m_fontBank->print(x,y,buf); +*/ // Lives x=350; @@ -387,6 +389,7 @@ void CPauseMenu::renderLives() sb->printFT4(fh,x,y,0,0,0); x+=fh->W; sprintf(buf,"x%d",gameSlot->m_lives); + textYOff=fh->H-m_fontBank->getStringHeight(buf); y+=textYOff; m_fontBank->print(x,y,buf); } diff --git a/source/player/player.cpp b/source/player/player.cpp index 3b0c10396..06cdb2f99 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -26,6 +26,10 @@ #include "pad\vibe.h" #endif +#ifndef __GAME_GAME_H__ +#include "game\game.h" +#endif + #ifndef __GAME_GAMESLOT_H__ #include "game\gameslot.h" #endif @@ -90,10 +94,6 @@ #include "platform\platform.h" #endif -#ifndef __GAME_GAME_H__ -#include "game\game.h" -#endif - #ifndef __PICKUPS_PICKUP_H__ #include "pickups\pickup.h" #endif @@ -1341,18 +1341,30 @@ if(drawlastpos) // UI - char spatCount[20]; - int x,y; + int count; sFrameHdr *fh; + char countBuf[5]; + int x,y; - // Spat count - sprintf(spatCount,"x%d",m_numSpatulasHeld); + // Spat/token count + if(GameScene.getLevelNumber()!=5) + { + // Spat count + count=m_numSpatulasHeld; + fh=sb->getFrameHeader(FRM__SPATULA); + } + else + { + // Token count + count=CGameSlotManager::getSlotData()->getKelpTokenCollectedCount(GameScene.getChapterNumber()-1,GameScene.getLevelNumber()-1); + fh=sb->getFrameHeader(FRM__TOKEN); + } + sprintf(countBuf,"x%d",count); x=SB_UI_XBASE; y=SB_UI_YBASE; - fh=sb->getFrameHeader(FRM__SPATULA); sb->printFT4(fh,x,y,0,0,POWERUPUI_OT); x+=fh->W; - m_fontBank->print(x,y,spatCount); + m_fontBank->print(x,y,countBuf); x+=SB_UI_GAP_FROM_SPAT_COUNT_TO_PICKUPS; if(isWearingDivingHelmet()) diff --git a/source/shop/shop.cpp b/source/shop/shop.cpp index f66d1579b..ec1cdff6e 100644 --- a/source/shop/shop.cpp +++ b/source/shop/shop.cpp @@ -118,17 +118,17 @@ Vars ---- */ -// 82 tokens in total +// 125 tokens in total CShopScene::SHOPITEM CShopScene::s_shopItems[NUM_SHOP_ITEM_IDS]= { - { 1, FRM_BLOWER }, - { 2, FRM_CAKE }, - { 3, FRM_CUPCAKE }, - { 4, FRM_JELLY2 }, - { 5, FRM_PARTYHAT }, - { 6, FRM_PREZZIE }, - { 7, FRM_SARNIE }, - { 8, FRM_TEDDY }, + { 5, FRM_TEDDY }, + { 8, FRM_SARNIE }, + { 10, FRM_CUPCAKE }, + { 12, FRM_PREZZIE }, + { 16, FRM_JELLY2 }, + { 20, FRM_CAKE }, + { 24, FRM_BLOWER }, + { 30, FRM_PARTYHAT }, }; xmPlayingId s_playId;