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 20:01:43 +00:00
parent 4cefba60e7
commit 36572baaac
3 changed files with 80 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

5
source/game/game.cpp
View file

@ -617,10 +617,13 @@ void CGameScene::think_playing(int _frames)
} }
if(!m_pauseMenu->isActive()&&PadGetDown(0)&PAD_START&&canPause()) if(canPause()&&!m_pauseMenu->isActive())
{
if(PadGetDown(0)&PAD_START||!PadIsConnected(0))
{ {
m_pauseMenu->select(); m_pauseMenu->select();
} }
}
// Conversation think ( with pad debounce stuff.. ) // Conversation think ( with pad debounce stuff.. )
if(CConversation::isActive())m_player->ignoreNewlyPressedButtonsOnPadThisThink(); if(CConversation::isActive())m_player->ignoreNewlyPressedButtonsOnPadThisThink();

3
source/pickups/pjlammo.h
View file

@ -60,6 +60,9 @@ public:
protected: protected:
virtual int getWeaponSpriteFrame(); virtual int getWeaponSpriteFrame();
private:
virtual CSoundMediator::SFXID sfxToPlayWhenCollected(){return CSoundMediator::SFX_JELLY_LAUNCHER;}
}; };

71
source/sound/xmplay.cpp
View file

@ -54,12 +54,24 @@
Vars Vars
---- */ ---- */
#ifdef __VERSION_DEBUG__
#define _SOUNDDEBUG
#endif
#ifdef _SOUNDDEBUG
#include "pad\pads.h"
#ifdef __USER_paul__ #ifdef __USER_paul__
static int sounddebug=true; static int sounddebug=true;
#else #else
static int sounddebug=false; static int sounddebug=false;
#endif #endif
#endif /* SFX_JELLY_LAUNCHER */
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
Function: Function:
@ -222,29 +234,34 @@ void CXMPlaySound::think()
////////////// //////////////
#ifdef _SOUNDDEBUG
if(PadGetDown(1)&PAD_L1&&PadGetHeld(1)&(PAD_L2|PAD_R1|PAD_R2))
{
sounddebug=!sounddebug;
}
if(sounddebug) if(sounddebug)
{ {
static const int colours[6][3]= static const int colours[6][3]=
{ {
{ 255,255,255 }, // SONG { 255,255,255 }, // SONG
{ 255, 0,255 }, // SFX { 255, 0,255 }, // SFX
{ 0, 0,255 }, // LOOPINGSFX { 0, 0,255 }, // LOOPINGSFX
{ 255,255, 0 }, // SILENT { 255,255, 0 }, // SILENT
{ 0,255, 0 }, // FREE { 0,255, 0 }, // FREE
{ 128,128,128 }, // CONTINUE { 128,128,128 }, // CONTINUE
}; };
static int frameFlag=0; static int frameFlag=0;
int i,x,free; int i,x,free;
spuChannelUse *ch; spuChannelUse *ch;
POLY_F4 *f4; POLY_F4 *f4;
x=50; x=50;
free=0; free=0;
ch=m_spuChannelUse; ch=m_spuChannelUse;
for(i=0;i<NUM_SPU_CHANNELS;i++) for(i=0;i<NUM_SPU_CHANNELS;i++)
{ {
const int *colour=&colours[ch->m_useType][0]; const int *colour=&colours[ch->m_useType][0];
f4=GetPrimF4(); f4=GetPrimF4();
setXYWH(f4,x,20,8,8); setXYWH(f4,x,20,8,8);
@ -264,30 +281,30 @@ for(i=0;i<NUM_SPU_CHANNELS;i++)
x+=10; x+=10;
ch++; ch++;
} }
f4=GetPrimF4(); f4=GetPrimF4();
setXYWH(f4,50,15,(24*10)-2,2); setXYWH(f4,50,15,(24*10)-2,2);
if(frameFlag) if(frameFlag)
{ {
setRGB0(f4,255,255,255); setRGB0(f4,255,255,255);
} }
else else
{ {
setRGB0(f4,0,0,0); setRGB0(f4,0,0,0);
} }
AddPrimToList(f4,0); AddPrimToList(f4,0);
frameFlag^=1; frameFlag^=1;
if(!free) if(!free)
{ {
f4=GetPrimF4(); f4=GetPrimF4();
setXYWH(f4,50,30,(24*10)-2,4); setXYWH(f4,50,30,(24*10)-2,4);
setRGB0(f4,255,0,0); setRGB0(f4,255,0,0);
AddPrimToList(f4,0); AddPrimToList(f4,0);
}
} }
#endif /* _SOUNDDEBUG */
}
////////////// //////////////
} }