zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-07-04 16:27:35 +00:00
parent 235a381998
commit e8b1a04308
4 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/game/gameslot.cpp
View file

@ -173,7 +173,7 @@ void CGameSlotManager::eraseGameSlot(unsigned int _slot)
} }
#ifdef __USER_paul__ #ifdef __USER_paul__
slot->m_kelpTokensHeld=82; slot->m_kelpTokensHeld=125;
#else #else
slot->m_kelpTokensHeld=0; slot->m_kelpTokensHeld=0;
#endif #endif

3
source/game/pause.cpp
View file

@ -367,6 +367,7 @@ void CPauseMenu::renderLives()
gameSlot=CGameSlotManager::getSlotData(); gameSlot=CGameSlotManager::getSlotData();
/*
// Spat count // Spat count
x=100; x=100;
y=137; y=137;
@ -378,6 +379,7 @@ void CPauseMenu::renderLives()
textYOff=fh->H-m_fontBank->getStringHeight(buf); textYOff=fh->H-m_fontBank->getStringHeight(buf);
y+=textYOff; y+=textYOff;
m_fontBank->print(x,y,buf); m_fontBank->print(x,y,buf);
*/
// Lives // Lives
x=350; x=350;
@ -387,6 +389,7 @@ void CPauseMenu::renderLives()
sb->printFT4(fh,x,y,0,0,0); sb->printFT4(fh,x,y,0,0,0);
x+=fh->W; x+=fh->W;
sprintf(buf,"x%d",gameSlot->m_lives); sprintf(buf,"x%d",gameSlot->m_lives);
textYOff=fh->H-m_fontBank->getStringHeight(buf);
y+=textYOff; y+=textYOff;
m_fontBank->print(x,y,buf); m_fontBank->print(x,y,buf);
} }

32
source/player/player.cpp
View file

@ -26,6 +26,10 @@
#include "pad\vibe.h" #include "pad\vibe.h"
#endif #endif
#ifndef __GAME_GAME_H__
#include "game\game.h"
#endif
#ifndef __GAME_GAMESLOT_H__ #ifndef __GAME_GAMESLOT_H__
#include "game\gameslot.h" #include "game\gameslot.h"
#endif #endif
@ -90,10 +94,6 @@
#include "platform\platform.h" #include "platform\platform.h"
#endif #endif
#ifndef __GAME_GAME_H__
#include "game\game.h"
#endif
#ifndef __PICKUPS_PICKUP_H__ #ifndef __PICKUPS_PICKUP_H__
#include "pickups\pickup.h" #include "pickups\pickup.h"
#endif #endif
@ -1341,18 +1341,30 @@ if(drawlastpos)
// UI // UI
char spatCount[20]; int count;
int x,y;
sFrameHdr *fh; sFrameHdr *fh;
char countBuf[5];
int x,y;
// Spat count // Spat/token count
sprintf(spatCount,"x%d",m_numSpatulasHeld); 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; x=SB_UI_XBASE;
y=SB_UI_YBASE; y=SB_UI_YBASE;
fh=sb->getFrameHeader(FRM__SPATULA);
sb->printFT4(fh,x,y,0,0,POWERUPUI_OT); sb->printFT4(fh,x,y,0,0,POWERUPUI_OT);
x+=fh->W; x+=fh->W;
m_fontBank->print(x,y,spatCount); m_fontBank->print(x,y,countBuf);
x+=SB_UI_GAP_FROM_SPAT_COUNT_TO_PICKUPS; x+=SB_UI_GAP_FROM_SPAT_COUNT_TO_PICKUPS;
if(isWearingDivingHelmet()) if(isWearingDivingHelmet())

18
source/shop/shop.cpp
View file

@ -118,17 +118,17 @@
Vars Vars
---- */ ---- */
// 82 tokens in total // 125 tokens in total
CShopScene::SHOPITEM CShopScene::s_shopItems[NUM_SHOP_ITEM_IDS]= CShopScene::SHOPITEM CShopScene::s_shopItems[NUM_SHOP_ITEM_IDS]=
{ {
{ 1, FRM_BLOWER }, { 5, FRM_TEDDY },
{ 2, FRM_CAKE }, { 8, FRM_SARNIE },
{ 3, FRM_CUPCAKE }, { 10, FRM_CUPCAKE },
{ 4, FRM_JELLY2 }, { 12, FRM_PREZZIE },
{ 5, FRM_PARTYHAT }, { 16, FRM_JELLY2 },
{ 6, FRM_PREZZIE }, { 20, FRM_CAKE },
{ 7, FRM_SARNIE }, { 24, FRM_BLOWER },
{ 8, FRM_TEDDY }, { 30, FRM_PARTYHAT },
}; };
xmPlayingId s_playId; xmPlayingId s_playId;