From 6339c4cbeb608b008eafe0b1e358285ae08ef902 Mon Sep 17 00:00:00 2001
From: Russell Rice
Date: Thu, 21 Sep 2006 11:13:28 +0000
Subject: Fix a lot of warnings (for fussy compilers) and one always-true check

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 641
---
 src/wi_stuff.c | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'src/wi_stuff.c')

diff --git a/src/wi_stuff.c b/src/wi_stuff.c
index 212ea45c..d7031cc6 100644
--- a/src/wi_stuff.c
+++ b/src/wi_stuff.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: wi_stuff.c 537 2006-05-29 11:19:53Z fraggle $
+// $Id: wi_stuff.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -44,7 +44,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: wi_stuff.c 537 2006-05-29 11:19:53Z fraggle $";
+rcsid[] = "$Id: wi_stuff.c 641 2006-09-21 11:13:28Z rtc_marine $";
 
 #include <stdio.h>
 
@@ -248,39 +248,39 @@ static point_t lnodes[NUMEPISODES][NUMMAPS] =
 //
 static anim_t epsd0animinfo[] =
 {
-    { ANIM_ALWAYS, TICRATE/3, 3, { 224, 104 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 184, 160 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 112, 136 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 72, 112 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 88, 96 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 64, 48 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 192, 40 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 136, 16 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 80, 16 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 64, 24 } }
+    { ANIM_ALWAYS, TICRATE/3, 3, { 224, 104 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 184, 160 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 112, 136 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 72, 112 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 88, 96 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 64, 48 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 192, 40 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 136, 16 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 80, 16 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 64, 24 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
 static anim_t epsd1animinfo[] =
 {
-    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 1 },
-    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 2 },
-    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 3 },
-    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 4 },
-    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 5 },
-    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 6 },
-    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 7 },
-    { ANIM_LEVEL, TICRATE/3, 3, { 192, 144 }, 8 },
-    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 8 }
+    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 3, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 4, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 5, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 6, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 7, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_LEVEL, TICRATE/3, 3, { 192, 144 }, 8, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_LEVEL, TICRATE/3, 1, { 128, 136 }, 8, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
 static anim_t epsd2animinfo[] =
 {
-    { ANIM_ALWAYS, TICRATE/3, 3, { 104, 168 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 40, 136 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 160, 96 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 104, 80 } },
-    { ANIM_ALWAYS, TICRATE/3, 3, { 120, 32 } },
-    { ANIM_ALWAYS, TICRATE/4, 3, { 40, 0 } }
+    { ANIM_ALWAYS, TICRATE/3, 3, { 104, 168 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 40, 136 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 160, 96 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 104, 80 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/3, 3, { 120, 32 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { ANIM_ALWAYS, TICRATE/4, 3, { 40, 0 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
 static int NUMANIMS[NUMEPISODES] =
-- 
cgit v1.2.3