Added a quit button to the Super Melee menu

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2362 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2006-05-19 13:30:01 +00:00
parent ca45b94c9e
commit 4814d6830f
6 changed files with 15 additions and 2 deletions
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.6:
- Added a quit button for the Super Melee main menu - Michael
- Fixed sporadic uqm.cfg loading errors in release builds - Alex
- Quit (F10) now works correctly during intro (bug #862) - Alex
- Playing failure sounds when entering text consistently (bug #884) - Alex
Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 249 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 251 B

+2
View File
@@ -27,3 +27,5 @@ melebkgd.25.png -1 0 -253 -77
melebkgd.26.png -1 0 -253 -77
melebkgd.27.png -1 0 0 50
melebkgd.28.png -1 0 -2 -22
melebkgd.29.png -1 0 -268 -217
melebkgd.30.png -1 0 -268 -217
+12 -2
View File
@@ -62,6 +62,7 @@ enum
LOAD_BOT,
SAVE_BOT,
CONTROLS_BOT,
QUIT_BOT,
EDIT_MELEE
};
@@ -514,6 +515,9 @@ Deselect (BYTE opt)
case SAVE_BOT:
DrawMeleeIcon (21);
break;
case QUIT_BOT:
DrawMeleeIcon (29);
break;
case CONTROLS_TOP:
case CONTROLS_BOT:
{
@@ -560,6 +564,9 @@ Select (BYTE opt)
case SAVE_BOT:
DrawMeleeIcon (23);
break;
case QUIT_BOT:
DrawMeleeIcon (30);
break;
case CONTROLS_TOP:
case CONTROLS_BOT:
{
@@ -1708,8 +1715,8 @@ DoMelee (PMELEE_STATE pMS)
else if (PulsedInputState.menu[KEY_MENU_DOWN])
{
InTime = GetTimeCounter ();
if (NewMeleeOption++ == CONTROLS_BOT)
NewMeleeOption = CONTROLS_BOT;
if (NewMeleeOption++ == QUIT_BOT)
NewMeleeOption = QUIT_BOT;
}
if ((PlayerControl[0] & PlayerControl[1] & PSYTRON_CONTROL)
@@ -1806,6 +1813,9 @@ DoMelee (PMELEE_STATE pMS)
else
PlayMenuSound (MENU_SOUND_FAILURE);
break;
case QUIT_BOT:
GLOBAL (CurrentActivity) |= CHECK_ABORT;
break;
case CONTROLS_TOP:
case CONTROLS_BOT:
{