diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 4768c0244..7320f07a2 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.3: +- New main menu graphics from MarkVera, Paxtez, Nic (bug #393) - Removed a place where you could ask for repairs when you shouldn't (bug #432), from Nic - Can use F10 to quit during splash screen as well as main menu -Michael diff --git a/sc2/content/lbm/newgame.0.png b/sc2/content/lbm/newgame.0.png index 3b2141f90..9ce7e7686 100644 Binary files a/sc2/content/lbm/newgame.0.png and b/sc2/content/lbm/newgame.0.png differ diff --git a/sc2/content/lbm/newgame.1.png b/sc2/content/lbm/newgame.1.png index 68ec64351..38f1d7927 100644 Binary files a/sc2/content/lbm/newgame.1.png and b/sc2/content/lbm/newgame.1.png differ diff --git a/sc2/content/lbm/newgame.2.png b/sc2/content/lbm/newgame.2.png index fe9ee4045..0a12fdb4e 100644 Binary files a/sc2/content/lbm/newgame.2.png and b/sc2/content/lbm/newgame.2.png differ diff --git a/sc2/content/lbm/newgame.3.png b/sc2/content/lbm/newgame.3.png index 745521fc5..ce7753451 100644 Binary files a/sc2/content/lbm/newgame.3.png and b/sc2/content/lbm/newgame.3.png differ diff --git a/sc2/content/lbm/newgame.ani b/sc2/content/lbm/newgame.ani index cbe85ca95..1cf821a78 100755 --- a/sc2/content/lbm/newgame.ani +++ b/sc2/content/lbm/newgame.ani @@ -1,4 +1,6 @@ newgame.0.png -1 0 0 0 -newgame.1.png -1 0 -186 -18 -newgame.2.png -1 0 -125 -157 -newgame.3.png -1 0 -32 -71 +newgame.1.png -1 0 -105 -45 +newgame.2.png -1 0 -104 -77 +newgame.3.png -1 0 -91 -109 +newgame.4.png -1 0 -130 -141 +newgame.5.png -1 0 -139 -173 diff --git a/sc2/src/sc2code/restart.c b/sc2/src/sc2code/restart.c index 7db251525..58dc490be 100644 --- a/sc2/src/sc2code/restart.c +++ b/sc2/src/sc2code/restart.c @@ -42,7 +42,9 @@ enum { START_NEW_GAME = 0, LOAD_SAVED_GAME, - PLAY_SUPER_MELEE + PLAY_SUPER_MELEE, + SETUP_GAME, + QUIT_GAME }; static void @@ -123,6 +125,8 @@ else if (InputState & DEVICE_EXIT) return (FALSE); } else if (CurrentMenuState.select) { + BYTE fade_buf[1]; + switch (pMS->CurState) { case LOAD_SAVED_GAME: @@ -136,6 +140,20 @@ else if (InputState & DEVICE_EXIT) return (FALSE); case PLAY_SUPER_MELEE: GLOBAL (CurrentActivity) = SUPER_MELEE; break; + case SETUP_GAME: + PlaySoundEffect (SetAbsSoundIndex (MenuSounds, 2), + 0, NotPositional (), NULL, GAME_SOUND_PRIORITY); + InTime = GetTimeCounter (); + return TRUE; + break; + case QUIT_GAME: + PlaySoundEffect (SetAbsSoundIndex (MenuSounds, 1), + 0, NotPositional (), NULL, GAME_SOUND_PRIORITY); + fade_buf[0] = FadeAllToBlack; + SleepThreadUntil (XFormColorMap ((COLORMAPPTR)fade_buf, ONE_SECOND / 2)); + + GLOBAL (CurrentActivity) = CHECK_ABORT; + break; } SetSemaphore (GraphicsSem); @@ -149,17 +167,16 @@ else if (InputState & DEVICE_EXIT) return (FALSE); BYTE NewState; NewState = pMS->CurState; - if (CurrentMenuState.left || CurrentMenuState.up) + if (CurrentMenuState.up) { if (NewState-- == START_NEW_GAME) - NewState = PLAY_SUPER_MELEE; + NewState = QUIT_GAME; } - else if (CurrentMenuState.right || CurrentMenuState.down) + else if (CurrentMenuState.down) { - if (NewState++ == PLAY_SUPER_MELEE) + if (NewState++ == QUIT_GAME) NewState = START_NEW_GAME; } - if (NewState != pMS->CurState) { DrawRestartMenu (pMS->CurState, NewState, pMS->CurFrame);