1
0
forked from 0ad/0ad

# Added return-to-menu hotkey.

This was SVN commit r4518.
This commit is contained in:
Matei 2006-10-08 02:51:16 +00:00
parent 4d9e292b4e
commit 35d6805010
3 changed files with 15 additions and 5 deletions

View File

@ -27,6 +27,16 @@
]]></action> ]]></action>
</object> </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. --> <!-- EMPTY OBJECT USED TO TOGGLE WATER RENDERING. -->
<object name="snWaterToggle" <object name="snWaterToggle"
hotkey="water.toggle" hotkey="water.toggle"

View File

@ -155,8 +155,8 @@ function endSession (closeType)
endGame(); endGame();
// Fade out current music and return to playing menu theme. // Fade out current music and return to playing menu theme.
curr_music = newRandomSound("music", "menu"); //curr_music = newRandomSound("music", "menu");
crossFade(curr_session_playlist_1, curr_music, 1); //crossFade(curr_session_playlist_1, curr_music, 1);
// Stop refreshing the session controls. // Stop refreshing the session controls.
cancelInterval(); cancelInterval();

View File

@ -350,6 +350,9 @@ function snRefresh()
// Refresh handler that monitors whether property/selection has been updated. // Refresh handler that monitors whether property/selection has been updated.
resetUpdateVars(); resetUpdateVars();
// Refresh resources
refreshResources();
} }
if ( selectionChanged && getGUIObjectByName( "mn" ).hidden == false) if ( selectionChanged && getGUIObjectByName( "mn" ).hidden == false)
@ -357,9 +360,6 @@ function snRefresh()
// Update manual if it's open. // Update manual if it's open.
refreshManual(); refreshManual();
} }
// Always refresh resources
refreshResources();
} }
// ==================================================================== // ====================================================================