From f2df7e44fa7dea766fe66713db612e13cfb2b80c Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Wed, 8 Oct 2003 21:02:17 +0000
Subject: [PATCH] SHAREWARE fixes

---
 ChangeLog      |  2 ++
 main/gameseq.c | 13 +++++--------
 main/menu.c    | 14 +++++---------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a09f139..b350c05d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-10-08  Bradley Bell  <btb@icculus.org>
 
+	* main/gameseq.c, main/menu.c: SHAREWARE fixes
+
 	* arch/win32/ipx_udp.c: use closesocket() instead of close()
 
 2003-10-08  Bradley Bell  <btb@icculus.org>
diff --git a/main/gameseq.c b/main/gameseq.c
index c1348a69..a3b00bfa 100644
--- a/main/gameseq.c
+++ b/main/gameseq.c
@@ -1,4 +1,4 @@
-/* $Id: gameseq.c,v 1.27 2003-08-03 22:00:14 btb Exp $ */
+/* $Id: gameseq.c,v 1.28 2003-10-08 21:02:17 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-char gameseq_rcsid[] = "$Id: gameseq.c,v 1.27 2003-08-03 22:00:14 btb Exp $";
+char gameseq_rcsid[] = "$Id: gameseq.c,v 1.28 2003-10-08 21:02:17 btb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -153,9 +153,7 @@ void filter_objects_from_level();
 int	Current_level_num=0,Next_level_num;
 char	Current_level_name[LEVEL_NAME_LEN];
 
-#if !defined(SHAREWARE) && !defined(D2_OEM)
-int Last_level,Last_secret_level;
-#endif
+int Last_level, Last_secret_level;
 
 // Global variables describing the player
 int 				N_players=1;						// Number of players ( >1 means a net game, eh?)
@@ -1458,10 +1456,9 @@ void DoEndGame(void)
 
 	key_flush();
 
-	if (Current_mission_num == Builtin_mission_num && !(Game_mode & GM_MULTI)) { //only built-in mission, & not multi
-#ifndef SHAREWARE
+	if (Current_mission_num == Builtin_mission_num && !(Game_mode & GM_MULTI))
+	{ //only built-in mission, & not multi
 		int played=MOVIE_NOT_PLAYED;	//default is not played
-#endif
 
 		init_subtitles(ENDMOVIE ".tex");	//ingore errors
 		played = PlayMovie(ENDMOVIE,MOVIE_REQUIRED);
diff --git a/main/menu.c b/main/menu.c
index 995e57e6..52a2adca 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -1,4 +1,4 @@
-/* $Id: menu.c,v 1.28 2003-10-08 19:18:46 btb Exp $ */
+/* $Id: menu.c,v 1.29 2003-10-08 21:02:17 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -1054,8 +1054,6 @@ void do_screen_res_menu()
 void do_new_game_menu()
 {
 	int new_level_num,player_highest_level;
-
-#ifndef SHAREWARE
 	int n_missions;
 
 	n_missions = build_mission_list(0);
@@ -1085,7 +1083,6 @@ void do_new_game_menu()
 			return;
 		}
 	}
-#endif
 
 	new_level_num = 1;
 
@@ -1242,19 +1239,18 @@ void d2x_options_menu()
 			{
 				switch(i)
 				{
-					int n = 0;
 #if 0
-				case n++: reorder_primary(); break;
-				case n++: reorder_secondary(); break;
+				case 0: reorder_primary(); break;
+				case 1: reorder_secondary(); break;
 #endif
 #ifdef D2X_KEYS
 					//added on 2/4/99 by Victor Rachels for new key menu
-				case n++: kconfig(4, "D2X Keys"); break;
+				case 0: kconfig(4, "D2X Keys"); break;
 					//end this section addition - VR
 #endif
 #if 0
 					//enabled 3/24/99 - Owen Evans
-				case n++: change_res(); break;
+				case 3: change_res(); break;
 					//end enabled stuff - OE
 #endif
 				}
-- 
2.39.2