In Load Level, if there is no current mission, select one
authorBradley Bell <btb@icculus.org>
Fri, 7 Jan 2005 21:58:42 +0000 (21:58 +0000)
committerBradley Bell <btb@icculus.org>
Fri, 7 Jan 2005 21:58:42 +0000 (21:58 +0000)
ChangeLog
main/menu.c

index 7d56a19..6e91042 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-07  Bradley Bell  <btb@icculus.org>
+
+       * main/menu.c: In Load Level, if there is no current mission,
+       select one
+
 2005-01-05  Chris Taylor  <c.taylor@student.curtin.edu.au>
 
        * main/gameseq.c: Free polymodel data before reloading ham file.
index 9cc6d27..50abc7e 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: menu.c,v 1.39 2004-12-01 12:48:13 btb Exp $ */
+/* $Id: menu.c,v 1.40 2005-01-07 21:58:42 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -432,7 +432,9 @@ void do_option ( int select)
                                }
                        }
                        break;
-               case MENU_LOAD_LEVEL: {
+       case MENU_LOAD_LEVEL:
+               if (Current_mission || select_mission(0, "Load Level\n\nSelect mission"))
+               {
                        newmenu_item m;
                        char text[10]="";
                        int new_level_num;
@@ -447,9 +449,9 @@ void do_option ( int select)
                                gr_palette_fade_out( gr_palette, 32, 0 );
                                StartNewGame(new_level_num);
                        }
-
-                       break;
                }
+               break;
+
 #endif //ifndef RELEASE