# Added return-to-menu hotkey.
This was SVN commit r4518.
This commit is contained in:
parent
4d9e292b4e
commit
35d6805010
@ -27,6 +27,16 @@
|
||||
]]></action>
|
||||
</object>
|
||||
|
||||
<!-- EMPTY OBJECT USED TO RETURN TO MAIN MENU. -->
|
||||
<object name="snReturn"
|
||||
hotkey="menu.resign"
|
||||
>
|
||||
<action on="Press"><![CDATA[
|
||||
console.write("Returning to main menu!");
|
||||
endSession("return");
|
||||
]]></action>
|
||||
</object>
|
||||
|
||||
<!-- EMPTY OBJECT USED TO TOGGLE WATER RENDERING. -->
|
||||
<object name="snWaterToggle"
|
||||
hotkey="water.toggle"
|
||||
|
@ -155,8 +155,8 @@ function endSession (closeType)
|
||||
endGame();
|
||||
|
||||
// Fade out current music and return to playing menu theme.
|
||||
curr_music = newRandomSound("music", "menu");
|
||||
crossFade(curr_session_playlist_1, curr_music, 1);
|
||||
//curr_music = newRandomSound("music", "menu");
|
||||
//crossFade(curr_session_playlist_1, curr_music, 1);
|
||||
|
||||
// Stop refreshing the session controls.
|
||||
cancelInterval();
|
||||
|
@ -350,6 +350,9 @@ function snRefresh()
|
||||
|
||||
// Refresh handler that monitors whether property/selection has been updated.
|
||||
resetUpdateVars();
|
||||
|
||||
// Refresh resources
|
||||
refreshResources();
|
||||
}
|
||||
|
||||
if ( selectionChanged && getGUIObjectByName( "mn" ).hidden == false)
|
||||
@ -357,9 +360,6 @@ function snRefresh()
|
||||
// Update manual if it's open.
|
||||
refreshManual();
|
||||
}
|
||||
|
||||
// Always refresh resources
|
||||
refreshResources();
|
||||
}
|
||||
|
||||
// ====================================================================
|
Loading…
Reference in New Issue
Block a user