This commit is contained in:
Daveo 2001-07-26 16:14:58 +00:00
parent 0cf03a8b87
commit d292bd3e4f
3 changed files with 12 additions and 2 deletions

View file

@ -793,6 +793,7 @@ void CGameScene::initLevel()
CActorPool::SetUpCache(); CActorPool::SetUpCache();
m_musicStarted=false; m_musicStarted=false;
SetPadRescan();
SYSTEM_DBGMSG("InitLevelDone\n"); SYSTEM_DBGMSG("InitLevelDone\n");
} }

View file

@ -28,13 +28,14 @@ u8 PadBuffer[2][34];
u8 PadAlign[6]={0,1,0xFF,0xFF,0xFF,0xFF}; u8 PadAlign[6]={0,1,0xFF,0xFF,0xFF,0xFF};
u8 PadMotor[2][2]; u8 PadMotor[2][2];
int PadRepeatTimers[2][16]; int PadRepeatTimers[2][16];
int PadRescan=0;
typedef struct typedef struct
{ {
int m_vibrationTurnedOn; int m_vibrationTurnedOn;
u8 m_intensityValue; u8 m_intensityValue;
} PadVibeData; } PadVibeData;
#ifdef __USER_CDBUILD__ #if defined(__USER_CDBUILD__ )
static PadVibeData s_padVibeData[2]={{true,0},{true,0}}; static PadVibeData s_padVibeData[2]={{true,0},{true,0}};
#else #else
static PadVibeData s_padVibeData[2]={{false,0},{false,0}}; static PadVibeData s_padVibeData[2]={{false,0},{false,0}};
@ -207,6 +208,12 @@ int PadIsDualShock(int Port)
return (PadData[Port].IsAnalogue==2); return (PadData[Port].IsAnalogue==2);
} }
/*****************************************************************************/
void SetPadRescan()
{
PadRescan=1;
}
/*****************************************************************************/ /*****************************************************************************/
void ReadController(int Port) void ReadController(int Port)
{ {
@ -287,8 +294,9 @@ int intensity;
{ {
Pad->Send = 0; Pad->Send = 0;
} }
if ( Pad->Send==0 ) if ( Pad->Send==0 || PadRescan)
{ {
PadRescan=0;
PadSetAct(PortShift,&(Pad->Motor0),2); PadSetAct(PortShift,&(Pad->Motor0),2);
if (Pad->Status == PadStateFindCTP1) if (Pad->Status == PadStateFindCTP1)

View file

@ -79,6 +79,7 @@ void PadsInit();
void PadClear(int Port); void PadClear(int Port);
void PadUpdate(); void PadUpdate();
void SetPadRescan();
sPadData *PadGet(int Port); sPadData *PadGet(int Port);
u16 PadGetUp(int Port); u16 PadGetUp(int Port);