diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 87d75a4c8..9d9cc3ab2 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -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 diff --git a/sc2/content/melee/melebkgd.0.png b/sc2/content/melee/melebkgd.0.png index 5e00db716..57ae7c799 100644 Binary files a/sc2/content/melee/melebkgd.0.png and b/sc2/content/melee/melebkgd.0.png differ diff --git a/sc2/content/melee/melebkgd.29.png b/sc2/content/melee/melebkgd.29.png new file mode 100644 index 000000000..23f667cc4 Binary files /dev/null and b/sc2/content/melee/melebkgd.29.png differ diff --git a/sc2/content/melee/melebkgd.30.png b/sc2/content/melee/melebkgd.30.png new file mode 100644 index 000000000..f443419c0 Binary files /dev/null and b/sc2/content/melee/melebkgd.30.png differ diff --git a/sc2/content/melee/melebkgd.ani b/sc2/content/melee/melebkgd.ani index 1ed7f04e8..6f4381b2f 100755 --- a/sc2/content/melee/melebkgd.ani +++ b/sc2/content/melee/melebkgd.ani @@ -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 diff --git a/sc2/src/sc2code/melee.c b/sc2/src/sc2code/melee.c index 82b04cbea..adff0aad7 100644 --- a/sc2/src/sc2code/melee.c +++ b/sc2/src/sc2code/melee.c @@ -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: {