remove all battle-related theme elements
fix order of options on ScreenOptionsMenu default theme uses ScreenSelectDifficulty, NOT ScreenSelectDifficultyEx
This commit is contained in:
@@ -72,7 +72,7 @@ PreviewX=160
|
|||||||
PreviewY=240
|
PreviewY=240
|
||||||
HelpText=Use &LEFT; &RIGHT; to select, then press START
|
HelpText=Use &LEFT; &RIGHT; to select, then press START
|
||||||
TimerSeconds=40
|
TimerSeconds=40
|
||||||
NextScreen=ScreenSelectDifficultyEx
|
NextScreen=ScreenSelectDifficulty
|
||||||
|
|
||||||
[ScreenSelectStyle5th]
|
[ScreenSelectStyle5th]
|
||||||
HelpText=Use &LEFT; &RIGHT; to select, then press START
|
HelpText=Use &LEFT; &RIGHT; to select, then press START
|
||||||
|
|||||||
@@ -26,9 +26,15 @@ Inventory::Inventory()
|
|||||||
{
|
{
|
||||||
RefreshPossibleItems();
|
RefreshPossibleItems();
|
||||||
|
|
||||||
m_soundAcquireItem.Load( THEME->GetPathTo("Sounds","gameplay battle aquire item") );
|
// don't load battle sounds if they're not going to be used
|
||||||
m_soundUseItem.Load( THEME->GetPathTo("Sounds","gameplay battle use item") );
|
switch( GAMESTATE->m_PlayMode )
|
||||||
m_soundItemEnding.Load( THEME->GetPathTo("Sounds","gameplay battle item ending") );
|
{
|
||||||
|
case PLAY_MODE_BATTLE:
|
||||||
|
m_soundAcquireItem.Load( THEME->GetPathTo("Sounds","gameplay battle aquire item") );
|
||||||
|
m_soundUseItem.Load( THEME->GetPathTo("Sounds","gameplay battle use item") );
|
||||||
|
m_soundItemEnding.Load( THEME->GetPathTo("Sounds","gameplay battle item ending") );
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Inventory::RefreshPossibleItems()
|
void Inventory::RefreshPossibleItems()
|
||||||
|
|||||||
@@ -40,8 +40,8 @@ enum {
|
|||||||
|
|
||||||
OptionRowData g_OptionsMenuLines[NUM_OPTIONS_MENU_LINES] = {
|
OptionRowData g_OptionsMenuLines[NUM_OPTIONS_MENU_LINES] = {
|
||||||
{ "", 1, {"Appearance Options"} },
|
{ "", 1, {"Appearance Options"} },
|
||||||
|
{ "", 1, {"Config Key/Joy Mappings"} },
|
||||||
{ "", 1, {"Input Options"} },
|
{ "", 1, {"Input Options"} },
|
||||||
{ "", 1, {"Config Key/Joy"} },
|
|
||||||
{ "", 1, {"Gameplay Options"} },
|
{ "", 1, {"Gameplay Options"} },
|
||||||
{ "", 1, {"Graphic Options"} },
|
{ "", 1, {"Graphic Options"} },
|
||||||
{ "", 1, {"Machine Options"} },
|
{ "", 1, {"Machine Options"} },
|
||||||
|
|||||||
Reference in New Issue
Block a user