Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/game/game.cpp
View File

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

3
source/pickups/pjlammo.h
View File

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

127
source/sound/xmplay.cpp
View File

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