From 9739973e152f5024b2498d79d7e55dd6b2161af3 Mon Sep 17 00:00:00 2001
From: Martin Schaffner <schaffnerb@gmx.ch>
Date: Sat, 23 Oct 2004 18:59:02 +0000
Subject: [PATCH] move mission list handling functionality to mission.c, remove
 unnecessary load_mission calls in menu.c

---
 ChangeLog      |  3 +++
 main/menu.c    | 40 +++++++---------------------------------
 main/mission.c | 40 +++++++++++++++++++++++++++++++++++++++-
 main/mission.h | 11 +++++------
 main/multi.c   | 41 +----------------------------------------
 main/multi.h   |  3 +--
 main/network.c | 11 ++++++++---
 7 files changed, 64 insertions(+), 85 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b899779..95df24c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
 2004-10-23  Chris Taylor  <c.taylor@student.curtin.edu.au>
 
 	* cfile/cfile.c: declare variable on top of block
+	* main/menu.c, main/mission.c, main/mission.h, main/multi.c,
+	main/multi.h, main/network.c: move mission list handling functionality
+	to mission.c, remove unnecessary load_mission calls in menu.c
 
 2004-10-21  Martin Schaffner  <maschaffner@gmx.ch>
 
diff --git a/main/menu.c b/main/menu.c
index a9536b8d..9dae6240 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -1,4 +1,4 @@
-/* $Id: menu.c,v 1.37 2004-05-20 23:38:20 btb Exp $ */
+/* $Id: menu.c,v 1.38 2004-10-23 18:59:02 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -464,7 +464,7 @@ void do_option ( int select)
 		case MENU_JOIN_KALI_NETGAME:
 		case MENU_START_MCAST4_NETGAME:
 		case MENU_JOIN_MCAST4_NETGAME:
-			load_mission(Builtin_mission_num);
+//			load_mission(Builtin_mission_num);
 #ifdef MACINTOSH
 			Network_game_type = IPX_GAME;
 #endif
@@ -485,7 +485,7 @@ void do_option ( int select)
 
 #ifdef MACINTOSH
 		case MENU_START_APPLETALK_NETGAME:
-			load_mission(Builtin_mission_num);
+//			load_mission(Builtin_mission_num);
 			#ifdef MACINTOSH
 			Network_game_type = APPLETALK_GAME;
 			#endif
@@ -493,7 +493,7 @@ void do_option ( int select)
 			break;
 
 		case MENU_JOIN_APPLETALK_NETGAME:
-			load_mission(Builtin_mission_num);
+//			load_mission(Builtin_mission_num);
 			#ifdef MACINTOSH
 			Network_game_type = APPLETALK_GAME;
 			#endif
@@ -1060,36 +1060,10 @@ void do_screen_res_menu()
 void do_new_game_menu()
 {
 	int new_level_num,player_highest_level;
-	int n_missions;
-
-	n_missions = build_mission_list(0);
-
-	if (n_missions <= 1) {
-		load_mission(0);
-	} else {
-		int new_mission_num,i, default_mission;
-		char * m[MAX_MISSIONS];
-
-		default_mission = 0;
-		for (i=0;i<n_missions;i++) {
-			m[i] = Mission_list[i].mission_name;
-			if ( !stricmp( m[i], config_last_mission ) )
-				default_mission = i;
-		}
-
-		new_mission_num = newmenu_listbox1( "New Game\n\nSelect mission", n_missions, m, 1, default_mission, NULL );
-
-		if (new_mission_num == -1)
-			return;         //abort!
-
-		strcpy(config_last_mission, m[new_mission_num]  );
-
-		if (!load_mission(new_mission_num)) {
-			nm_messagebox( NULL, 1, TXT_OK, "Error in Mission file"); 
-			return;
-		}
-	}
 
+    if (!select_mission(0, "New Game\n\nSelect mission"))
+        return;
+    
 	new_level_num = 1;
 
 	player_highest_level = get_highest_level();
diff --git a/main/mission.c b/main/mission.c
index e87e817a..29070fd0 100644
--- a/main/mission.c
+++ b/main/mission.c
@@ -1,4 +1,4 @@
-/* $Id: mission.c,v 1.26 2004-08-29 17:57:23 schaffner Exp $ */
+/* $Id: mission.c,v 1.27 2004-10-23 18:59:02 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -40,6 +40,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "mono.h"
 #include "error.h"
 #include "findfile.h"
+#include "config.h"
+#include "newmenu.h"
+#include "text.h"
 
 mle Mission_list[MAX_MISSIONS];
 
@@ -794,3 +797,38 @@ int load_mission_by_name(char *mission_name)
 
 	return 0;		//couldn't find mission
 }
+
+int select_mission(int anarchy_mode, char *message)
+{
+    int n_missions;
+    
+    n_missions = build_mission_list(anarchy_mode);
+
+    if (n_missions <= 1) {
+        load_mission(0);
+    } else {
+        int new_mission_num,i, default_mission;
+        char * m[MAX_MISSIONS];
+
+        default_mission = 0;
+        for (i=0;i<n_missions;i++) {
+            m[i] = Mission_list[i].mission_name;
+            if ( !stricmp( m[i], config_last_mission ) )
+                default_mission = i;
+        }
+
+        new_mission_num = newmenu_listbox1( message, n_missions, m, 1, default_mission, NULL );
+
+        if (new_mission_num == -1)
+            return 0;         //abort!
+
+        strcpy(config_last_mission, m[new_mission_num]  );
+
+        if (!load_mission(new_mission_num)) {
+            nm_messagebox( NULL, 1, TXT_OK, TXT_MISSION_ERROR);
+            return 0;
+        }
+    }
+
+    return 1;
+}
diff --git a/main/mission.h b/main/mission.h
index 2c737e07..24e4678e 100644
--- a/main/mission.h
+++ b/main/mission.h
@@ -1,4 +1,4 @@
-/* $Id: mission.h,v 1.18 2004-10-09 15:59:28 schaffner Exp $ */
+/* $Id: mission.h,v 1.19 2004-10-23 18:59:02 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -99,13 +99,12 @@ extern char Secret_level_names[MAX_SECRET_LEVELS_PER_MISSION][FILENAME_LEN];
 //if there is only one mission, this function will call load_mission on it.
 int build_mission_list(int anarchy_mode);
 
-//loads the specfied mission from the mission list.  build_mission_list()
-//must have been called.  If build_mission_list() returns 0, this function
-//does not need to be called.  Returns true if mission loaded ok, else false.
-int load_mission(int mission_num);
-
 //loads the named mission if exists.
 //Returns true if mission loaded ok, else false.
 int load_mission_by_name(char *mission_name);
 
+//Handles creating and selecting from the mission list.
+//Returns 1 if a mission was loaded.
+int select_mission(int anarchy_mode, char *message);
+
 #endif
diff --git a/main/multi.c b/main/multi.c
index 3e8df49a..89576c7c 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -1,4 +1,4 @@
-/* $Id: multi.c,v 1.16 2004-08-01 16:28:33 schaffner Exp $ */
+/* $Id: multi.c,v 1.17 2004-10-23 18:59:02 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -461,45 +461,6 @@ get_team(int pnum)
 		return 0;
 }
 
-int
-multi_choose_mission(int *anarchy_only)
-{
-	int i, n_missions;
-	int default_mission;
-	char *m[MAX_MISSIONS];
-	int new_mission_num = 0;
-
-	*anarchy_only = 0;
-
-	n_missions = build_mission_list(1);
-
-	if (n_missions > 1) {
-
-		default_mission = 0;
-		for (i=0;i<n_missions;i++) {
-			m[i] = Mission_list[i].mission_name;
-			if ( !stricmp( m[i], config_last_mission ) )
-				default_mission = i;
-		}
-
-      ExtGameStatus=GAMESTAT_START_MULTIPLAYER_MISSION;
-		new_mission_num = newmenu_listbox1(TXT_MULTI_MISSION, n_missions, m, 1, default_mission, NULL );
-
-		if (new_mission_num == -1)
-			return -1;      //abort!
-
-		strcpy(config_last_mission, m[new_mission_num]  );
-
-		if (!load_mission(new_mission_num)) {
-			nm_messagebox( NULL, 1, TXT_OK, TXT_MISSION_ERROR);
-			return -1;
-		}
-
-		*anarchy_only = Mission_list[new_mission_num].anarchy_only_flag;
-	}
-	return(new_mission_num);
-}
-
 extern void game_disable_cheats();
 
 void
diff --git a/main/multi.h b/main/multi.h
index 4b27c7b7..26e8f251 100644
--- a/main/multi.h
+++ b/main/multi.h
@@ -1,4 +1,4 @@
-/* $Id: multi.h,v 1.14 2004-08-28 23:17:45 schaffner Exp $ */
+/* $Id: multi.h,v 1.15 2004-10-23 18:59:02 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -180,7 +180,6 @@ void multi_send_macro(int key);
 int multi_get_kill_list(int *plist);
 void multi_new_game(void);
 void multi_sort_kill_list(void);
-int multi_choose_mission(int *anarchy_only);
 void multi_reset_stuff(void);
 
 void multi_send_data(char *buf, int len, int repeat);
diff --git a/main/network.c b/main/network.c
index 826b597f..d5ee5749 100644
--- a/main/network.c
+++ b/main/network.c
@@ -1,4 +1,4 @@
-/* $Id: network.c,v 1.24 2003-10-12 09:38:48 btb Exp $ */
+/* $Id: network.c,v 1.25 2004-10-23 18:59:02 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: network.c,v 1.24 2003-10-12 09:38:48 btb Exp $";
+static char rcsid[] = "$Id: network.c,v 1.25 2004-10-23 18:59:02 schaffner Exp $";
 #endif
 
 #define PATCH12
@@ -3013,7 +3013,12 @@ int network_get_game_params( char * game_name, int *mode, int *game_flags, int *
 	Netgame.Allow_marker_view=1;
 	netgame_difficulty=Player_default_difficulty;
 
-	new_mission_num = multi_choose_mission(&anarchy_only);
+    ExtGameStatus=GAMESTAT_START_MULTIPLAYER_MISSION;
+    if (!select_mission(1, TXT_MULTI_MISSION))
+        return -1;
+
+	new_mission_num = Current_mission_num;
+    anarchy_only = Mission_list[new_mission_num].anarchy_only_flag;
 
 	if (new_mission_num < 0)
 		return -1;
-- 
2.39.2