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-16 20:55:33 +00:00
parent aa9b709247
commit d07a457f6b
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/player/pmbloon.cpp
View file

@ -133,7 +133,7 @@ void CPlayerModeBalloon::render(DVECTOR *_pos)
pos.vy=_pos->vy+balloony; pos.vy=_pos->vy+balloony;
if(m_timer<BALLOON_TIMEOUT-BALLOON_POP_FRAMES) if(m_timer<BALLOON_TIMEOUT-BALLOON_POP_FRAMES)
{ {
frame=FRM__BALLOON; frame=FRM__SMALL_BALLOON;
} }
else else
{ {
@ -162,7 +162,7 @@ void CPlayerModeBalloon::renderModeUi()
sFrameHdr *fh; sFrameHdr *fh;
sb=CGameScene::getSpriteBank(); sb=CGameScene::getSpriteBank();
fh=sb->getFrameHeader(FRM__BALLOON); fh=sb->getFrameHeader(FRM__SMALL_BALLOON);
sb->printFT4Scaled(fh,CPlayer::POWERUPUI_ICONX,CPlayer::POWERUPUI_ICONY,0,0,CPlayer::POWERUPUI_OT,384); sb->printFT4Scaled(fh,CPlayer::POWERUPUI_ICONX,CPlayer::POWERUPUI_ICONY,0,0,CPlayer::POWERUPUI_OT,384);
} }

2
source/player/pmbubble.cpp
View file

@ -258,7 +258,7 @@ void CPlayerModeBubbleMixture::renderModeUi()
FontBank *fb; FontBank *fb;
sb=CGameScene::getSpriteBank(); sb=CGameScene::getSpriteBank();
fh=sb->getFrameHeader(FRM__BUBBLEWAND); fh=sb->getFrameHeader(FRM__SMALL_BUBBLEWAND);
sb->printFT4(fh,CPlayer::POWERUPUI_ICONX,CPlayer::POWERUPUI_ICONY,0,0,CPlayer::POWERUPUI_OT); sb->printFT4(fh,CPlayer::POWERUPUI_ICONX,CPlayer::POWERUPUI_ICONY,0,0,CPlayer::POWERUPUI_OT);
fb=m_player->getFontBank(); fb=m_player->getFontBank();

4
source/player/pmcoral.cpp
View file

@ -342,11 +342,11 @@ void CPlayerModeCoralBlower::renderModeUi()
// char buf[4]; // char buf[4];
sb=CGameScene::getSpriteBank(); sb=CGameScene::getSpriteBank();
fh=sb->getFrameHeader(FRM__BLOWER); fh=sb->getFrameHeader(FRM__SMALL_BLOWER);
if(m_blowerState==BLOWER_STATE__FULL||m_blowerState==BLOWER_STATE__AIMING) if(m_blowerState==BLOWER_STATE__FULL||m_blowerState==BLOWER_STATE__AIMING)
{ {
// Blower has a creature/object inside // Blower has a creature/object inside
sb->printFT4Scaled(FRM__BLOWER,CPlayer::POWERUPUI_ICONX,CPlayer::POWERUPUI_ICONY,0,0,CPlayer::POWERUPUI_OT,256+128); sb->printFT4Scaled(fh,CPlayer::POWERUPUI_ICONX,CPlayer::POWERUPUI_ICONY,0,0,CPlayer::POWERUPUI_OT,256+128);
if(m_blowerState==BLOWER_STATE__AIMING) if(m_blowerState==BLOWER_STATE__AIMING)
{ {

2
source/player/pmjelly.cpp
View file

@ -247,7 +247,7 @@ void CPlayerModeJellyLauncher::renderModeUi()
char buf[4]; char buf[4];
sb=CGameScene::getSpriteBank(); sb=CGameScene::getSpriteBank();
fh=sb->getFrameHeader(FRM__LAUNCHER); fh=sb->getFrameHeader(FRM__SMALL_LAUNCHER);
switch(m_firingState) switch(m_firingState)
{ {
case FIRING_STATE__NONE: case FIRING_STATE__NONE:

2
source/player/pmnet.cpp
View file

@ -359,7 +359,7 @@ void CPlayerModeNet::think()
char buf[4]; char buf[4];
sb=CGameScene::getSpriteBank(); sb=CGameScene::getSpriteBank();
fh=sb->getFrameHeader(FRM__NET); fh=sb->getFrameHeader(FRM__SMALL_NET);
if(m_player->getJellyFishAmmo()) if(m_player->getJellyFishAmmo())
{ {
POLY_FT4 *ft4; POLY_FT4 *ft4;

4
source/player/pmodes.cpp
View file

@ -423,7 +423,9 @@ void CPlayerModeBase::playerHasHitGround()
// Landed from a painfully long fall // Landed from a painfully long fall
// This no longer hurts as per THQs request.. // This no longer hurts as per THQs request..
setState(STATE_HITGROUND); setState(STATE_HITGROUND);
// m_player->takeDamage(DAMAGE__FALL,REACT__NO_REACTION); #ifdef __USER_paul__
m_player->takeDamage(DAMAGE__FALL,REACT__NO_REACTION);
#endif
moveVel.vx=0; moveVel.vx=0;
CGameScene::setCameraShake(0,8); CGameScene::setCameraShake(0,8);
} }