shut up compiler warnings

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 71

4 files changed, 33 insertions, 12 deletions

diff --git a/src/am_map.c b/src/am_map.c
index 3be51d92..7ccd7ccf 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: am_map.c 37 2005-08-04 18:42:15Z fraggle $
+// $Id: am_map.c 71 2005-09-04 18:44:23Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -23,6 +23,9 @@
 //
 //
 // $Log$
+// Revision 1.5  2005/09/04 18:44:22  fraggle
+// shut up compiler warnings
+//
 // Revision 1.4  2005/08/04 18:42:15  fraggle
 // Silence compiler warnings
 //
@@ -40,7 +43,7 @@
 //
 //-----------------------------------------------------------------------------
 
-static const char rcsid[] = "$Id: am_map.c 37 2005-08-04 18:42:15Z fraggle $";
+static const char rcsid[] = "$Id: am_map.c 71 2005-09-04 18:44:23Z fraggle $";
 
 #include <stdio.h>
 
@@ -969,6 +972,11 @@ AM_clipMline
 	    tmp.y = fl->a.y + (dy*(-fl->a.x))/dx;
 	    tmp.x = 0;
 	}
+        else
+        {
+            tmp.x = 0;
+            tmp.y = 0;
+        }
 
 	if (outside == outcode1)
 	{
diff --git a/src/d_main.c b/src/d_main.c
index 3b031a11..5dbf0661 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_main.c 69 2005-09-04 15:59:45Z fraggle $
+// $Id: d_main.c 71 2005-09-04 18:44:23Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.12  2005/09/04 18:44:22  fraggle
+// shut up compiler warnings
+//
 // Revision 1.11  2005/09/04 15:59:45  fraggle
 // 'novert' command line option to disable vertical mouse movement
 //
@@ -71,7 +74,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_main.c 69 2005-09-04 15:59:45Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 71 2005-09-04 18:44:23Z fraggle $";
 
 #define	BGCOLOR		7
 #define	FGCOLOR		8
@@ -83,6 +86,9 @@ static const char rcsid[] = "$Id: d_main.c 69 2005-09-04 15:59:45Z fraggle $";
 
 #ifdef _WIN32
 #include <io.h>
+#else
+#include <sys/stat.h>
+#include <sys/types.h>
 #endif
 
 
@@ -214,7 +220,8 @@ void D_ProcessEvents (void)
 	 && (W_CheckNumForName("map01")<0) )
       return;
 	
-    for ( ; eventtail != eventhead ; eventtail = (++eventtail)&(MAXEVENTS-1) )
+    for ( ; eventtail != eventhead ; 
+            eventtail = (eventtail + 1) & (MAXEVENTS-1) )
     {
 	ev = &events[eventtail];
 	if (M_Responder (ev))
diff --git a/src/d_net.c b/src/d_net.c
index 870bd330..16eac4cf 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_net.c 60 2005-08-31 21:24:24Z fraggle $
+// $Id: d_net.c 71 2005-09-04 18:44:23Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.6  2005/09/04 18:44:22  fraggle
+// shut up compiler warnings
+//
 // Revision 1.5  2005/08/31 21:24:24  fraggle
 // Remove the last traces of NORMALUNIX
 //
@@ -47,7 +50,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_net.c 60 2005-08-31 21:24:24Z fraggle $";
+static const char rcsid[] = "$Id: d_net.c 71 2005-09-04 18:44:23Z fraggle $";
 
 
 #include "m_menu.h"
@@ -483,7 +486,7 @@ void CheckAbort (void)
 	
     I_StartTic ();
     for ( ; eventtail != eventhead 
-	      ; eventtail = (++eventtail)&(MAXEVENTS-1) ) 
+	  ; eventtail = (eventtail + 1) & (MAXEVENTS-1) ) 
     { 
 	ev = &events[eventtail]; 
 	if (ev->type == ev_keydown && ev->data1 == KEY_ESCAPE)
diff --git a/src/g_game.c b/src/g_game.c
index eda7706a..044d8218 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: g_game.c 70 2005-09-04 17:33:43Z fraggle $
+// $Id: g_game.c 71 2005-09-04 18:44:23Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.8  2005/09/04 18:44:23  fraggle
+// shut up compiler warnings
+//
 // Revision 1.7  2005/09/04 17:33:43  fraggle
 // Support demos recorded with cph's modified "v1.91" doom exe - which
 // contain higher resolution angleturn
@@ -53,7 +56,7 @@
 
 
 static const char
-rcsid[] = "$Id: g_game.c 70 2005-09-04 17:33:43Z fraggle $";
+rcsid[] = "$Id: g_game.c 71 2005-09-04 18:44:23Z fraggle $";
 
 #include <string.h>
 #include <stdlib.h>
@@ -1258,7 +1261,7 @@ void G_DoLoadGame (void)
     int		length; 
     int		i; 
     int		a,b,c; 
-    char	vcheck[VERSIONSIZE]; 
+    char        vcheck[VERSIONSIZE]; 
 	 
     gameaction = ga_nothing; 
 	 
@@ -1268,7 +1271,7 @@ void G_DoLoadGame (void)
     // skip the description field 
     memset (vcheck,0,sizeof(vcheck)); 
     sprintf (vcheck,"version %i",DOOM_VERSION); 
-    if (strcmp (save_p, vcheck)) 
+    if (strcmp ((char *) save_p, vcheck)) 
 	return;				// bad version 
     save_p += VERSIONSIZE;