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

Browse source
This commit is contained in:
Daveo 2001-08-23 15:30:32 +00:00
parent 3dc2c02b01
commit 41a833f080
12 changed files with 76 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/translations/text.dat
View file

@ -767,7 +767,7 @@ eng=Special thanks to:
[STR__CREDITS__VOICE_OVER] [STR__CREDITS__VOICE_OVER]
eng=Voice Over eng=Voice Over
[STR__CREDITS__V_P__OF_INTERACTIVE_PRODUCT_AND_BOOK_PUBLISHING] [STR__CREDITS__V_P__OF_INTERACTIVE_PRODUCT_AND_BOOK_PUBLISHING]
eng=V.P. of Interactive Product and Book Publishing eng=V.P. of Interactive\nProduct and Book Publishing
[STR__CREDITS__DIRECTOR_OF_MARKETING_AND_NEW_BUSINESS_DEVELOPMENT] [STR__CREDITS__DIRECTOR_OF_MARKETING_AND_NEW_BUSINESS_DEVELOPMENT]
eng=Director of Marketing and New Business Development eng=Director of Marketing and New Business Development
[STR__CREDITS__DIRECTOR_OF_DEVELOPMENT_AND_PRODUCTION] [STR__CREDITS__DIRECTOR_OF_DEVELOPMENT_AND_PRODUCTION]
@ -777,7 +777,7 @@ eng=Project Coordinator
[STR__CREDITS__MARKETING_COORDINATOR] [STR__CREDITS__MARKETING_COORDINATOR]
eng=Marketing Coordinator eng=Marketing Coordinator
[STR__CREDITS__NICK_INTERACTIVE_WOULD_LIKE_TO_THANK_] [STR__CREDITS__NICK_INTERACTIVE_WOULD_LIKE_TO_THANK_]
eng=Nick Interactive would like to thank: eng=Nick Interactive\nwould like to thank:
; Climax ; Climax
@ -929,7 +929,7 @@ eng=Steve Hillenburg
[STR__CREDITS__ERIC_COLEMAN] [STR__CREDITS__ERIC_COLEMAN]
eng=Eric Coleman eng=Eric Coleman
[STR__CREDITS__THQ_AND_THE_THQ_LOGO_ARE_TRADEMARKS_AND_OR_REGISTERED_TRADEMARKS_OF_THQ_INC] [STR__CREDITS__THQ_AND_THE_THQ_LOGO_ARE_TRADEMARKS_AND_OR_REGISTERED_TRADEMARKS_OF_THQ_INC]
eng=THQ and the THQ logo are trademarks and/or registered trademarks of THQ Inc. eng=THQ and the THQ logo \nare trademarks and/or\nregistered trademarks of\nTHQ Inc.
[STR__CREDITS__C_2001_THQ_INC] [STR__CREDITS__C_2001_THQ_INC]
eng=(C) 2001 THQ Inc. eng=(C) 2001 THQ Inc.

6
source/frontend/start.cpp
View file

@ -272,7 +272,7 @@ void CFrontEndStart::drawGameSlot(int _xOff,int _slotNumber)
{ {
int xbase; int xbase;
CGameSlotManager::GameSlot *gameSlot; CGameSlotManager::GameSlot *gameSlot;
POLY_F4 *f4; TPOLY_F4 *f4;
int x,y; int x,y;
sFrameHdr *fh; sFrameHdr *fh;
int i; int i;
@ -283,10 +283,10 @@ void CFrontEndStart::drawGameSlot(int _xOff,int _slotNumber)
gameSlot=CGameSlotManager::getSlotData(); gameSlot=CGameSlotManager::getSlotData();
drawBambooBorder(xbase,SLOT_FRAME_Y,SLOT_FRAME_W,SLOT_FRAME_H,3); drawBambooBorder(xbase,SLOT_FRAME_Y,SLOT_FRAME_W,SLOT_FRAME_H,3);
f4=GetPrimF4(); f4=GetPrimTF4();
setXYWH(f4,xbase,SLOT_FRAME_Y,SLOT_FRAME_W,SLOT_FRAME_H); setXYWH(f4,xbase,SLOT_FRAME_Y,SLOT_FRAME_W,SLOT_FRAME_H);
setRGB0(f4, 0, 0, 90); setRGB0(f4, 0, 0, 90);
setSemiTrans(f4,true); setTSemiTrans(f4,true);
AddPrimToList(f4,3); AddPrimToList(f4,3);
x=xbase+SLOT_SLOTNUMBER_X; x=xbase+SLOT_SLOTNUMBER_X;

4
source/game/bosstext.cpp
View file

@ -244,10 +244,10 @@ void CBossText::render()
m_scalableFontBank->setScale(400); m_scalableFontBank->setScale(400);
m_scalableFontBank->setColour(128,128,128); m_scalableFontBank->setColour(128,128,128);
m_scalableFontBank->print(256-20,80+s_bossTextYOffset,bd->m_titleTextId); m_scalableFontBank->print(256-20,80+s_bossTextYOffset,bd->m_titleTextId);
/*
m_fontBank->setColour(118,118,118); m_fontBank->setColour(118,118,118);
m_fontBank->print(256-20,190+s_bossTextYOffset,bd->m_subTitleTextId); m_fontBank->print(256-20,190+s_bossTextYOffset,bd->m_subTitleTextId);
*/
// Boss gfx // Boss gfx
DVECTOR bossPoss; DVECTOR bossPoss;
bossPoss=pos; bossPoss=pos;

13
source/game/game.cpp
View file

@ -288,7 +288,7 @@ void CGameScene::render_showing_lives()
{ {
int colour; int colour;
char buf[20]; char buf[20];
POLY_F4 *f4; TPOLY_F4 *f4;
POLY_FT3 *ft3; POLY_FT3 *ft3;
@ -320,20 +320,21 @@ void CGameScene::render_showing_lives()
s_genericFont->print(256,140,buf); s_genericFont->print(256,140,buf);
// Black background // Black background
f4=GetPrimF4(); f4=GetPrimTF4();
setXYWH(f4,0,0,512,256); setXYWH(f4,0,0,512,256);
setRGB0(f4,colour,colour,colour); setRGB0(f4,colour,colour,colour);
setShadeTex(f4,0); setTShadeTex(f4,0);
setSemiTrans(f4,1); setTSemiTrans(f4,1);
setTABRMode(f4,2);
AddPrimToList(f4,0); AddPrimToList(f4,0);
ft3=GetPrimFT3(); /* ft3=GetPrimFT3();
setPolyFT3(ft3); setPolyFT3(ft3);
setShadeTex(ft3,1); setShadeTex(ft3,1);
setSemiTrans(ft3,1); setSemiTrans(ft3,1);
ft3->tpage=2<<5; ft3->tpage=2<<5;
setXY3(ft3,512,512,512,512,512,512); setXY3(ft3,512,512,512,512,512,512);
AddPrimToList(ft3,0); AddPrimToList(ft3,0);
*/
if(m_gamestate==GAMESTATE_SHOWING_LIVES_BUT_GOING_TO_BOSS_TEXT) if(m_gamestate==GAMESTATE_SHOWING_LIVES_BUT_GOING_TO_BOSS_TEXT)
{ {
m_bossText->render(); m_bossText->render();

41
source/gfx/fader.cpp
View file

@ -69,6 +69,11 @@ int CFader::s_waitFrames=0;
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CFader::render() void CFader::render()
{ {
int TMode;
TPOLY_F4 *f4;
TMode=(s_fadeStyle==BLACK_FADE?2:1);
switch(s_fadeMode) switch(s_fadeMode)
{ {
case FADED_IN: case FADED_IN:
@ -82,21 +87,13 @@ void CFader::render()
case BLACK_FADE: case BLACK_FADE:
case WHITE_FADE: case WHITE_FADE:
{ {
POLY_F4 *f4; f4=GetPrimTF4();
POLY_FT3 *ft3;
f4=GetPrimF4();
setXYWH(f4,0,0,VidGetScrW()+1,VidGetScrH()+1); setXYWH(f4,0,0,VidGetScrW()+1,VidGetScrH()+1);
setRGB0(f4,s_fadeValue,s_fadeValue,s_fadeValue); setRGB0(f4,s_fadeValue,s_fadeValue,s_fadeValue);
setShadeTex(f4,0); setTShadeTex(f4,0);
setSemiTrans(f4,1); setTSemiTrans(f4,1);
setTABRMode(f4,TMode);
AddPrimToList(f4,0); AddPrimToList(f4,0);
ft3=GetPrimFT3();
setPolyFT3(ft3);
setShadeTex(ft3,1);
setSemiTrans(ft3,1);
ft3->tpage=(s_fadeStyle==BLACK_FADE?2:1)<<5;
setXY3(ft3,0,0,0,512,512,0);
AddPrimToList(ft3,0);
break; break;
} }
} }
@ -111,23 +108,15 @@ void CFader::render()
case BLACK_FADE: case BLACK_FADE:
case WHITE_FADE: case WHITE_FADE:
{ {
POLY_F4 *f4;
POLY_FT3 *ft3;
int col; int col;
col=255-s_fadeValue; col=255-s_fadeValue;
f4=GetPrimF4(); f4=GetPrimTF4();
setXYWH(f4,0,0,VidGetScrW()+1,VidGetScrH()+1); setXYWH(f4,0,0,VidGetScrW()+1,VidGetScrH()+1);
setRGB0(f4,col,col,col); setRGB0(f4,col,col,col);
setShadeTex(f4,0); setTShadeTex(f4,0);
setSemiTrans(f4,1); setTSemiTrans(f4,1);
setTABRMode(f4,TMode);
AddPrimToList(f4,0); AddPrimToList(f4,0);
ft3=GetPrimFT3();
setPolyFT3(ft3);
setShadeTex(ft3,1);
setSemiTrans(ft3,1);
ft3->tpage=(s_fadeStyle==BLACK_FADE?2:1)<<5;
setXY3(ft3,512,512,512,512,512,512);
AddPrimToList(ft3,0);
break; break;
} }
} }
@ -136,9 +125,7 @@ void CFader::render()
case FADED_OUT: case FADED_OUT:
{ {
POLY_F4 *f4; f4=GetPrimTF4();
f4=GetPrimF4();
setXYWH(f4,0,0,VidGetScrW()+1,VidGetScrH()); setXYWH(f4,0,0,VidGetScrW()+1,VidGetScrH());
switch(s_fadeStyle) switch(s_fadeStyle)
{ {

18
source/gfx/prim.h
View file

@ -244,6 +244,7 @@ typedef u32 sOT;
setTile(CurrPrim-sizeof(TILE)) setTile(CurrPrim-sizeof(TILE))
// Extra prims :o) // Extra prims :o)
/* These DONT work :o(
#define GetPrimTF3() GetPrim(TPOLY_F3);\ #define GetPrimTF3() GetPrim(TPOLY_F3);\
setTPolyF3((TPOLY_F3*)CurrPrim-sizeof(TPOLY_F3)) setTPolyF3((TPOLY_F3*)CurrPrim-sizeof(TPOLY_F3))
@ -291,8 +292,7 @@ typedef u32 sOT;
#define GetPrimTTILE() GetPrim(TTILE);\ #define GetPrimTTILE() GetPrim(TTILE);\
setTile((TTILE*)CurrPrim-sizeof(TTILE)) setTile((TTILE*)CurrPrim-sizeof(TTILE))
*/
/********************************************************************************************************/ /********************************************************************************************************/
#define OtInRange (MAX_OT-1) #define OtInRange (MAX_OT-1)
#define OtOutRange (0xffffffff-OtInRange) #define OtOutRange (0xffffffff-OtInRange)
@ -324,6 +324,20 @@ void FlushPrimPool();
LINE_F2 *DrawLine(int _x0,int _y0,int _x1,int _y1,int _r,int _g,int _b,int _ot); LINE_F2 *DrawLine(int _x0,int _y0,int _x1,int _y1,int _r,int _g,int _b,int _ot);
LINE_G2 *DrawGLine(int _x0,int _y0,int _x1,int _y1,int _r1,int _g1,int _b1,int _r2,int _g2,int _b2,int _ot); LINE_G2 *DrawGLine(int _x0,int _y0,int _x1,int _y1,int _r1,int _g1,int _b1,int _r2,int _g2,int _b2,int _ot);
/********************************************************************************************************/
inline TPOLY_F3 *GetPrimTF3()
{
TPOLY_F3 *P=(TPOLY_F3 *)GetPrimPtr(); SetPrimPtr((u8*)(P+1)); setTPolyF3(P);
return(P);
}
/********************************************************************************************************/
inline TPOLY_F4 *GetPrimTF4()
{
TPOLY_F4 *P=(TPOLY_F4 *)GetPrimPtr(); SetPrimPtr((u8*)(P+1)); setTPolyF4(P);
return(P);
}
/********************************************************************************************************/ /********************************************************************************************************/
/*** Inlines ********************************************************************************************/ /*** Inlines ********************************************************************************************/
/********************************************************************************************************/ /********************************************************************************************************/

2
source/gfx/primplus.h
View file

@ -127,7 +127,7 @@
#define setTTile16(p) setTDrawTPageSize((p), GPUSIZE_TTILE_16), ((p)->code)=GPUCODE_TILE_16 #define setTTile16(p) setTDrawTPageSize((p), GPUSIZE_TTILE_16), ((p)->code)=GPUCODE_TILE_16
#define setTSemiTrans(p, abe) setSemiTrans(&((p)->t_code), (abe)) #define setTSemiTrans(p, abe) setSemiTrans(&((p)->t_code), (abe))
#define setTSetShadeTex(p, st) setShadeTex(&((p)->t_code), (st)) #define setTShadeTex(p, st) setShadeTex(&((p)->t_code), (st))
#define setTABRMode(p,abr) ((p)->t_code) = _get_mode(0,1,(abr<<5)) #define setTABRMode(p,abr) ((p)->t_code) = _get_mode(0,1,(abr<<5))
#define setTSprtTPage(p,tp) ((p)->t_code) = _get_mode(0,1,(tp)) #define setTSprtTPage(p,tp) ((p)->t_code) = _get_mode(0,1,(tp))
#define setTSprtTPageABR(p,t,a) ((p)->t_code) = _get_mode(0,1,(((t)&0x19f)|((a)<<5))) #define setTSprtTPageABR(p,t,a) ((p)->t_code) = _get_mode(0,1,(((t)&0x19f)|((a)<<5)))

30
source/gui/gui.cpp
View file

@ -147,7 +147,7 @@ void CGUIObject::render()
if(getFlags(FLAG_DRAWBORDER)) if(getFlags(FLAG_DRAWBORDER))
{ {
POLY_F4 *f4; TPOLY_F4 *f4;
int x,y,w,h; int x,y,w,h;
int ot; int ot;
@ -161,10 +161,10 @@ void CGUIObject::render()
drawBambooBorder(x,y,w,h,ot); drawBambooBorder(x,y,w,h,ot);
// Background // Background
f4=GetPrimF4(); f4=GetPrimTF4();
setXYWH(f4,x,y,w,h); setXYWH(f4,x,y,w,h);
setRGB0(f4, 0, 0, 90); setRGB0(f4, 0, 0, 90);
setSemiTrans(f4,true); setTSemiTrans(f4,true);
AddPrimToList(f4,ot); AddPrimToList(f4,ot);
} }
@ -491,10 +491,10 @@ void drawSpeechBubbleBorder(int _x,int _y,int _w,int _h,int _ot,int _faceFrame)
sFrameHdr *cornerFh; sFrameHdr *cornerFh;
POLY_FT4 *ft4; POLY_FT4 *ft4;
LINE_F2 *f2; LINE_F2 *f2;
POLY_F4 *f4;
int centreX,centreY; int centreX,centreY;
sFrameHdr *faceFh; sFrameHdr *faceFh;
POLY_F3 *f3; TPOLY_F4 *f4;
TPOLY_F3 *f3;
// Squeeze in the corners a bit.. // Squeeze in the corners a bit..
@ -516,20 +516,20 @@ void drawSpeechBubbleBorder(int _x,int _y,int _w,int _h,int _ot,int _faceFrame)
f2=DrawLine(_x+_w,_y+_h+cornerFh->H+1,_x,_y+_h+cornerFh->H+1,0,0,0,_ot);setSemiTrans(f2,true); f2=DrawLine(_x+_w,_y+_h+cornerFh->H+1,_x,_y+_h+cornerFh->H+1,0,0,0,_ot);setSemiTrans(f2,true);
// White middle // White middle
f4=GetPrimF4(); f4=GetPrimTF4();
setXYWH(f4,_x,_y-cornerFh->H,_w+1,cornerFh->H); setXYWH(f4,_x,_y-cornerFh->H,_w+1,cornerFh->H);
setRGB0(f4,255,255,255); setRGB0(f4,255,255,255);
setSemiTrans(f4,true); setTSemiTrans(f4,true);
AddPrimToList(f4,_ot); AddPrimToList(f4,_ot);
f4=GetPrimF4(); f4=GetPrimTF4();
setXYWH(f4,_x-cornerFh->W,_y,_w+(cornerFh->W*2)+1,_h+1); setXYWH(f4,_x-cornerFh->W,_y,_w+(cornerFh->W*2)+1,_h+1);
setRGB0(f4,255,255,255); setRGB0(f4,255,255,255);
setSemiTrans(f4,true); setTSemiTrans(f4,true);
AddPrimToList(f4,_ot); AddPrimToList(f4,_ot);
f4=GetPrimF4(); f4=GetPrimTF4();
setXYWH(f4,_x,_y+_h+1,_w+1,cornerFh->H); setXYWH(f4,_x,_y+_h+1,_w+1,cornerFh->H);
setRGB0(f4,255,255,255); setRGB0(f4,255,255,255);
setSemiTrans(f4,true); setTSemiTrans(f4,true);
AddPrimToList(f4,_ot); AddPrimToList(f4,_ot);
if(_faceFrame!=-1) if(_faceFrame!=-1)
@ -548,12 +548,12 @@ void drawSpeechBubbleBorder(int _x,int _y,int _w,int _h,int _ot,int _faceFrame)
f2=DrawLine(_x-cornerFh->W-1,_y+sbb.speechmarkgapfromtop,speechmarkEndX,speechmarkEndY,0,0,0,_ot);setSemiTrans(f2,true); f2=DrawLine(_x-cornerFh->W-1,_y+sbb.speechmarkgapfromtop,speechmarkEndX,speechmarkEndY,0,0,0,_ot);setSemiTrans(f2,true);
f2=DrawLine(speechmarkEndX,speechmarkEndY,_x-cornerFh->W-1,_y+sbb.speechmarkgapfromtop+sbb.speechmarkheight,0,0,0,_ot);setSemiTrans(f2,true); f2=DrawLine(speechmarkEndX,speechmarkEndY,_x-cornerFh->W-1,_y+sbb.speechmarkgapfromtop+sbb.speechmarkheight,0,0,0,_ot);setSemiTrans(f2,true);
f2=DrawLine(_x-cornerFh->W-1,_y+sbb.speechmarkgapfromtop+sbb.speechmarkheight+1,_x-cornerFh->W-1,_y+_h,0,0,0,_ot);setSemiTrans(f2,true); f2=DrawLine(_x-cornerFh->W-1,_y+sbb.speechmarkgapfromtop+sbb.speechmarkheight+1,_x-cornerFh->W-1,_y+_h,0,0,0,_ot);setSemiTrans(f2,true);
f3=GetPrimF3(); f3=GetPrimTF3();
setXY3(f3,_x-cornerFh->W,_y+sbb.speechmarkgapfromtop, setXY3(f3,_x-cornerFh->W,_y+sbb.speechmarkgapfromtop,
speechmarkEndX,speechmarkEndY, speechmarkEndX,speechmarkEndY,
_x-cornerFh->W,_y+sbb.speechmarkgapfromtop+sbb.speechmarkheight); _x-cornerFh->W,_y+sbb.speechmarkgapfromtop+sbb.speechmarkheight);
setRGB0(f3,255,255,255); setRGB0(f3,255,255,255);
setSemiTrans(f3,true); setTSemiTrans(f3,true);
AddPrimToList(f3,_ot); AddPrimToList(f3,_ot);
} }
else else
@ -564,10 +564,10 @@ void drawSpeechBubbleBorder(int _x,int _y,int _w,int _h,int _ot,int _faceFrame)
// Background // Background
/* /*
f4=GetPrimF4(); f4=GetPrimTF4();
setXYWH(f4,0,0,512,256); setXYWH(f4,0,0,512,256);
setRGB0(f4, 0, 0, 90); setRGB0(f4, 0, 0, 90);
setSemiTrans(f4,true); setTSemiTrans(f4,true);
AddPrimToList(f4,_ot); AddPrimToList(f4,_ot);
*/ */
} }

2
source/hazard/hcheck.cpp
View file

@ -71,7 +71,7 @@ void CNpcCheckpointHazard::think(int _frames)
{ {
int HF=GameState::getOneSecondInFrames()>>1; int HF=GameState::getOneSecondInFrames()>>1;
if (m_timer<HF) m_flick^=2; if (m_timer<HF) m_flick^=2;
if (m_flick & 2) if (m_flick & 2 && !GameScene.getIsPaused() )
{ {
m_scalableFont->setJustification(FontBank::JUST_CENTRE); m_scalableFont->setJustification(FontBank::JUST_CENTRE);
m_scalableFont->print( 256, 50, "Checkpoint!" ); m_scalableFont->print( 256, 50, "Checkpoint!" );

2
source/level/layertile.cpp
View file

@ -49,7 +49,7 @@ CLayerTile::CLayerTile(sLevelHdr *LevelHdr,sLayerHdr *Hdr)
for (int i=0; i<PrimCount; i++) for (int i=0; i<PrimCount; i++)
{ {
setTSprt(PrimPtr); setTSprt(PrimPtr);
setTSetShadeTex(PrimPtr,1); setTShadeTex(PrimPtr,1);
PrimPtr->w=TILE2D_WIDTH; PrimPtr->w=TILE2D_WIDTH;
PrimPtr->h=TILE2D_HEIGHT; PrimPtr->h=TILE2D_HEIGHT;
PrimPtr++; PrimPtr++;

37
source/player/player.cpp
View file

@ -642,7 +642,6 @@ void CPlayer::init()
s_playerModes[i]->initialise(this); s_playerModes[i]->initialise(this);
} }
CurrentPrompt=-1; CurrentPrompt=-1;
LastPrompt=-1;
PromptRGB=0; PromptRGB=0;
PromptFade=0; PromptFade=0;
@ -1382,7 +1381,7 @@ void CPlayer::render()
CPlayerThing::render(); CPlayerThing::render();
#ifdef _STATE_DEBUG_ #ifdef _STATE_DEBUG_x
char buf[100]; char buf[100];
#ifdef __USER_paul__ #ifdef __USER_paul__
sprintf(buf,"%04d (%02d) ,%04d (%02d)\ndfg:%+02d\nMode:%s",Pos.vx,Pos.vx&0x0f,Pos.vy,Pos.vy&0x0f,getHeightFromGround(Pos.vx,Pos.vy),s_modeText[m_currentMode]); sprintf(buf,"%04d (%02d) ,%04d (%02d)\ndfg:%+02d\nMode:%s",Pos.vx,Pos.vx&0x0f,Pos.vy,Pos.vy&0x0f,getHeightFromGround(Pos.vx,Pos.vy),s_modeText[m_currentMode]);
@ -2078,6 +2077,7 @@ void CPlayer::respawn()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
const int ExtraListYPos=50-32;
void CPlayer::renderSb(DVECTOR *_pos,int _animNo,int _animFrame) void CPlayer::renderSb(DVECTOR *_pos,int _animNo,int _animFrame)
{ {
int playerMode; int playerMode;
@ -2192,7 +2192,7 @@ void CPlayer::renderSb(DVECTOR *_pos,int _animNo,int _animFrame)
// Pants? // Pants?
if(m_pantFlashTimer>0) if(m_pantFlashTimer>0)
{ {
SpriteBank *sb=CGameScene::getSpriteBank(); /* SpriteBank *sb=CGameScene::getSpriteBank();
sFrameHdr *fh; sFrameHdr *fh;
DVECTOR drawPos; DVECTOR drawPos;
int size; int size;
@ -2202,12 +2202,13 @@ void CPlayer::renderSb(DVECTOR *_pos,int _animNo,int _animFrame)
drawPos.vy+=PANT_FLASH_Y_OFFSET; drawPos.vy+=PANT_FLASH_Y_OFFSET;
size=m_pantFlashTimer&8?4096:8192; size=m_pantFlashTimer&8?4096:8192;
ft4=sb->printRotatedScaledSprite(fh,drawPos.vx,drawPos.vy,size,size,0,0); ft4=sb->printRotatedScaledSprite(fh,drawPos.vx,drawPos.vy,size,size,0,0);
if (FrameFlipFlag&1) */
if (FrameFlipFlag&1 && !GameScene.getIsPaused())
{ {
m_scalableFontBank->setJustification(FontBank::JUST_CENTRE); m_scalableFontBank->setJustification(FontBank::JUST_CENTRE);
m_scalableFontBank->setScale(511); m_scalableFontBank->setScale(511);
m_scalableFontBank->setColour(255,255,255); m_scalableFontBank->setColour(255,255,255);
m_scalableFontBank->print( 256, 50, "Extra Life!"); m_scalableFontBank->print( 256, ExtraListYPos, "Extra Life!");
} }
} }
@ -3337,31 +3338,21 @@ int NewPrompt=m_currentMode;
PromptFade=-PromptFadeSpeed*4; PromptFade=-PromptFadeSpeed*4;
} }
if (!PromptTable[NewPrompt].Data || NewPrompt==LastPrompt) if (!PromptTable[NewPrompt].Data || PromptTable[NewPrompt].Shown)
{ {
NewPrompt=-1; NewPrompt=-1;
} }
/*
if (NewPrompt!=-1 && PromptTable[NewPrompt].Shown)
{
NewPrompt=-1;
}
*/
// Check for Prompt change // Check for Prompt change
if (CurrentPrompt!=NewPrompt && NewPrompt!=-1) if (CurrentPrompt!=NewPrompt && NewPrompt!=-1)
{ {
if (CurrentPrompt==-1) if (CurrentPrompt==-1)
{ // no prompt, so just display it { // no prompt, so just display it
if (LastPrompt!=-1)
{
PromptTable[LastPrompt].Shown=1;
}
CurrentPrompt=NewPrompt; CurrentPrompt=NewPrompt;
LastPrompt=NewPrompt;
PromptTimer=PromptOnScreenTime; PromptTimer=PromptOnScreenTime;
PromptRGB=0; PromptRGB=0;
PromptFade=+PromptFadeSpeed; PromptFade=+PromptFadeSpeed;
PromptTable[CurrentPrompt].Shown=1; // Set as shown
} }
else else
{ {
@ -3458,17 +3449,15 @@ int MaxTLen=0;
// Background // Background
int BackRGB=PromptRGB/2; int BackRGB=PromptRGB/2;
u8 *PrimPtr=GetPrimPtr(); TPOLY_F4 *F4=GetPrimTF4(); setTSemiTrans(F4,1); setTABRMode(F4,0);
TPOLY_F4 *F4=(TPOLY_F4 *)PrimPtr;
PrimPtr+=sizeof(TPOLY_F4);
SetPrimPtr((u8*)PrimPtr);
setTPolyF4(F4);
setXYWH(F4,PromptIconX-2,Y-2,MaxTLen+(X-PromptIconX)+4,(PromptY-Y)+4); setXYWH(F4,PromptIconX-2,Y-2,MaxTLen+(X-PromptIconX)+4,(PromptY-Y)+4);
setRGB0(F4,BackRGB,BackRGB,BackRGB); setRGB0(F4,BackRGB,BackRGB,BackRGB);
setTSemiTrans(F4,1);
setTABRMode(F4,2);
AddPrimToList(F4,0); AddPrimToList(F4,0);
// revert Fontbank settings - shouldnt have to do this, grrrr
m_fontBank->setTrans(0);
m_fontBank->setColour(128,128,128);
m_fontBank->setSMode(0);
} }
/*=========================================================================== /*===========================================================================

1
source/player/player.h
View file

@ -282,7 +282,6 @@ private:
int PromptRGB; int PromptRGB;
int PromptFade; int PromptFade;
int CurrentPrompt; int CurrentPrompt;
int LastPrompt;
int PromptTimer; int PromptTimer;
static sPromptTable PromptTable[NUM_PLAYERMODES]; static sPromptTable PromptTable[NUM_PLAYERMODES];