From e611eaa679b869c902d972e64a15c5784980d31d Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Sat, 12 Apr 2003 02:52:38 +0000
Subject: [PATCH] fix compiler warnings

---
 ChangeLog       | 7 +++++++
 main/automap.c  | 4 +++-
 main/gamemine.c | 6 +++---
 main/menu.c     | 4 +++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59abd97fd..f230b3369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-11  Bradley Bell  <btb@icculus.org>
+
+	* main/automap.c, main/gamemine.c, main/menu.c: fix compiler
+	warnings
+
+0.2.0:
+
 2003-04-11  Bradley Bell  <btb@icculus.org>
 
 	* libmve/mveplay.c: use _sleep instead of sleep on win32
diff --git a/main/automap.c b/main/automap.c
index 4617bb378..e89f041e2 100644
--- a/main/automap.c
+++ b/main/automap.c
@@ -1,4 +1,4 @@
-/* $Id: automap.c,v 1.8 2003-03-01 01:51:15 btb Exp $ */
+/* $Id: automap.c,v 1.9 2003-04-12 02:52:38 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -909,7 +909,9 @@ void do_automap( int key_code )	{
 	int leave_mode=0;
 	int first_time=1;
 	int pcx_error;
+#ifndef AUTOMAP_DIRECT_RENDER
 	int i;
+#endif
 	int c, marker_num;
 	fix entry_time;
 	int pause_game=1;		// Set to 1 if everything is paused during automap...No pause during net.
diff --git a/main/gamemine.c b/main/gamemine.c
index f7cbcb647..6d526b5fc 100644
--- a/main/gamemine.c
+++ b/main/gamemine.c
@@ -1,4 +1,4 @@
-/* $Id: gamemine.c,v 1.22 2003-04-03 06:07:35 btb Exp $ */
+/* $Id: gamemine.c,v 1.23 2003-04-12 02:52:38 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -142,7 +142,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: gamemine.c,v 1.22 2003-04-03 06:07:35 btb Exp $";
+static char rcsid[] = "$Id: gamemine.c,v 1.23 2003-04-12 02:52:38 btb Exp $";
 #endif
 
 #include <stdio.h>
@@ -1064,7 +1064,7 @@ int load_mine_data_compiled(CFILE *LoadFile)
 	int     i, segnum, sidenum;
 	ubyte   compiled_version;
 	short   temp_short;
-	ushort  temp_ushort;
+	ushort  temp_ushort = 0;
 	ubyte   bit_mask;
 
 	if (!strcmp(strchr(Gamesave_current_filename, '.'), ".sdl"))
diff --git a/main/menu.c b/main/menu.c
index ff56eac22..dc1547f77 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -1,4 +1,4 @@
-/* $Id: menu.c,v 1.23 2003-03-22 04:04:47 btb Exp $ */
+/* $Id: menu.c,v 1.24 2003-04-12 02:52:38 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -1186,8 +1186,10 @@ void d2x_options_menu()
 	//enabled 3/24/99 - Owen Evans
 	m[opt].type = NM_TYPE_MENU;  m[opt].text = "Change Screen Resolution";         opt++;
 	//end enabled stuff - OE
+#endif
 
 	commands=opt;
+#if 0
 	//added on 2/2/99 by Victor Rachels for bans
 #ifdef NETWORK
 	m[opt].type = NM_TYPE_MENU; m[opt].text = "Save bans now"; opt++;