small style cleanup
This commit is contained in:
@@ -50,13 +50,13 @@ void ScreenAttract::SetAttractVolume( bool bInAttract )
|
|||||||
if( bInAttract )
|
if( bInAttract )
|
||||||
{
|
{
|
||||||
if( GAMESTATE->IsTimeToPlayAttractSounds() )
|
if( GAMESTATE->IsTimeToPlayAttractSounds() )
|
||||||
SOUNDMAN->SetVolumeOfNonCriticalSounds( g_fSoundVolumeAttract ); // unmute attract sounds
|
SOUNDMAN->SetVolumeOfNonCriticalSounds( g_fSoundVolumeAttract ); // unmute attract sounds
|
||||||
else
|
else
|
||||||
SOUNDMAN->SetVolumeOfNonCriticalSounds( 0.0f ); // mute attract sounds
|
SOUNDMAN->SetVolumeOfNonCriticalSounds( 0.0f ); // mute attract sounds
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SOUNDMAN->SetVolumeOfNonCriticalSounds( 1.0f ); // unmute all sounds
|
SOUNDMAN->SetVolumeOfNonCriticalSounds( 1.0f ); // unmute all sounds
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,7 +93,7 @@ void ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuEle
|
|||||||
if( pScreen->IsTransitioning() )
|
if( pScreen->IsTransitioning() )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* HandleGlobalInputs() already played the coin sound. Don't play it again. */
|
// HandleGlobalInputs() already played the coin sound. Don't play it again.
|
||||||
if( input.MenuI != GAME_BUTTON_COIN )
|
if( input.MenuI != GAME_BUTTON_COIN )
|
||||||
SCREENMAN->PlayStartSound();
|
SCREENMAN->PlayStartSound();
|
||||||
|
|
||||||
@@ -138,9 +138,10 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
}
|
}
|
||||||
else if( SM == SM_GoToNextScreen )
|
else if( SM == SM_GoToNextScreen )
|
||||||
{
|
{
|
||||||
/* Look at the def of the screen we're going to; if it has a music theme element
|
/* Look at the def of the screen we're going to; if it has a music theme
|
||||||
* and it's the same as the one we're playing now, don't stop. However, if we're
|
* element and it's the same as the one we're playing now, don't stop.
|
||||||
* going to interrupt it when we fade in, stop the old music before we fade out. */
|
* However, if we're going to interrupt it when we fade in, stop the old
|
||||||
|
* music before we fade out. */
|
||||||
bool bMusicChanging = false;
|
bool bMusicChanging = false;
|
||||||
if( PLAY_MUSIC )
|
if( PLAY_MUSIC )
|
||||||
bMusicChanging = THEME->GetPathS(m_sName,"music") != THEME->GetPathS(GetNextScreenName(),"music",true); // GetPath optional on the next screen because it may not have music.
|
bMusicChanging = THEME->GetPathS(m_sName,"music") != THEME->GetPathS(GetNextScreenName(),"music",true); // GetPath optional on the next screen because it may not have music.
|
||||||
@@ -161,7 +162,6 @@ void ScreenAttract::GoToStartScreen( RString sScreenName )
|
|||||||
SCREENMAN->SetNewScreen( START_SCREEN(sScreenName) );
|
SCREENMAN->SetNewScreen( START_SCREEN(sScreenName) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// lua start
|
// lua start
|
||||||
#include "LuaBinding.h"
|
#include "LuaBinding.h"
|
||||||
|
|
||||||
|
|||||||
@@ -23,9 +23,7 @@ public:
|
|||||||
|
|
||||||
virtual ScreenType GetScreenType() const { return attract; }
|
virtual ScreenType GetScreenType() const { return attract; }
|
||||||
|
|
||||||
//
|
|
||||||
// Lua
|
// Lua
|
||||||
//
|
|
||||||
virtual void PushSelf( lua_State *L );
|
virtual void PushSelf( lua_State *L );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@@ -34,7 +32,6 @@ protected:
|
|||||||
ThemeMetric<bool> ATTRACT_VOLUME;
|
ThemeMetric<bool> ATTRACT_VOLUME;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user