add LIGHTSMODE_MENU_START_ONLY LIGHTSMODE_MENU_START_AND_DIRECTIONS
This commit is contained in:
@@ -37,7 +37,8 @@ StringToX( CabinetLight );
|
|||||||
static const char *LightsModeNames[] = {
|
static const char *LightsModeNames[] = {
|
||||||
"Attract",
|
"Attract",
|
||||||
"Joining",
|
"Joining",
|
||||||
"Menu",
|
"MenuStartOnly",
|
||||||
|
"MenuStartAndDirections",
|
||||||
"Demonstration",
|
"Demonstration",
|
||||||
"Gameplay",
|
"Gameplay",
|
||||||
"Stage",
|
"Stage",
|
||||||
@@ -224,7 +225,8 @@ void LightsManager::Update( float fDeltaTime )
|
|||||||
m_LightsState.m_bCabinetLights[LIGHT_BASS_RIGHT] = bOn;
|
m_LightsState.m_bCabinetLights[LIGHT_BASS_RIGHT] = bOn;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case LIGHTSMODE_MENU:
|
case LIGHTSMODE_MENU_START_ONLY:
|
||||||
|
case LIGHTSMODE_MENU_START_AND_DIRECTIONS:
|
||||||
case LIGHTSMODE_JOINING:
|
case LIGHTSMODE_JOINING:
|
||||||
{
|
{
|
||||||
FOREACH_CabinetLight( cl )
|
FOREACH_CabinetLight( cl )
|
||||||
@@ -248,13 +250,42 @@ void LightsManager::Update( float fDeltaTime )
|
|||||||
default: ASSERT(0);
|
default: ASSERT(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Light the button lights for active players. */
|
/* Light the menu buttons. */
|
||||||
FOREACH_PlayerNumber( pn )
|
switch( m_LightsMode )
|
||||||
{
|
{
|
||||||
if( GAMESTATE->m_bSideIsJoined[pn] )
|
DEFAULT_FAIL(m_LightsMode);
|
||||||
|
case LIGHTSMODE_MENU_START_ONLY:
|
||||||
|
case LIGHTSMODE_MENU_START_AND_DIRECTIONS:
|
||||||
{
|
{
|
||||||
m_LightsState.m_bGameButtonLights[pn][GAME_BUTTON_START] = true;
|
float fSec = RageTimer::GetTimeSinceStartFast();
|
||||||
|
float fFractionSec = fSec - truncf(fSec);
|
||||||
|
bool bOn = fFractionSec < 0.5f;
|
||||||
|
FOREACH_PlayerNumber( pn )
|
||||||
|
{
|
||||||
|
if( GAMESTATE->m_bSideIsJoined[pn] )
|
||||||
|
{
|
||||||
|
m_LightsState.m_bGameButtonLights[pn][GAME_BUTTON_START] = bOn;
|
||||||
|
switch( m_LightsMode )
|
||||||
|
{
|
||||||
|
DEFAULT_FAIL(m_LightsMode);
|
||||||
|
case LIGHTSMODE_MENU_START_ONLY:
|
||||||
|
break;
|
||||||
|
case LIGHTSMODE_MENU_START_AND_DIRECTIONS:
|
||||||
|
m_LightsState.m_bGameButtonLights[pn][GAME_BUTTON_MENULEFT] = bOn;
|
||||||
|
m_LightsState.m_bGameButtonLights[pn][GAME_BUTTON_MENURIGHT] = bOn;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
case LIGHTSMODE_JOINING:
|
||||||
|
FOREACH_PlayerNumber( pn )
|
||||||
|
{
|
||||||
|
if( GAMESTATE->m_bSideIsJoined[pn] )
|
||||||
|
m_LightsState.m_bGameButtonLights[pn][GAME_BUTTON_START] = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -315,7 +346,8 @@ void LightsManager::Update( float fDeltaTime )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case LIGHTSMODE_MENU:
|
case LIGHTSMODE_MENU_START_ONLY:
|
||||||
|
case LIGHTSMODE_MENU_START_AND_DIRECTIONS:
|
||||||
case LIGHTSMODE_GAMEPLAY:
|
case LIGHTSMODE_GAMEPLAY:
|
||||||
{
|
{
|
||||||
if( m_LightsMode == LIGHTSMODE_GAMEPLAY && g_bBlinkGameplayButtonLightsOnNote )
|
if( m_LightsMode == LIGHTSMODE_GAMEPLAY && g_bBlinkGameplayButtonLightsOnNote )
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ enum LightsMode
|
|||||||
{
|
{
|
||||||
LIGHTSMODE_ATTRACT,
|
LIGHTSMODE_ATTRACT,
|
||||||
LIGHTSMODE_JOINING,
|
LIGHTSMODE_JOINING,
|
||||||
LIGHTSMODE_MENU,
|
LIGHTSMODE_MENU_START_ONLY,
|
||||||
|
LIGHTSMODE_MENU_START_AND_DIRECTIONS,
|
||||||
LIGHTSMODE_DEMONSTRATION,
|
LIGHTSMODE_DEMONSTRATION,
|
||||||
LIGHTSMODE_GAMEPLAY,
|
LIGHTSMODE_GAMEPLAY,
|
||||||
LIGHTSMODE_STAGE,
|
LIGHTSMODE_STAGE,
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ void ScreenTestLights::BeginScreen()
|
|||||||
|
|
||||||
void ScreenTestLights::EndScreen()
|
void ScreenTestLights::EndScreen()
|
||||||
{
|
{
|
||||||
LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
|
LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU_START_AND_DIRECTIONS );
|
||||||
ScreenWithMenuElements::EndScreen();
|
ScreenWithMenuElements::EndScreen();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user