Fix a lot of warnings (for fussy compilers) and one always-true check

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

28 files changed, 349 insertions, 336 deletions

diff --git a/src/am_map.c b/src/am_map.c
index ead062ab..c218d3ba 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: am_map.c 162 2005-10-04 21:41:42Z fraggle $
+// $Id: am_map.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -49,7 +49,7 @@
 //
 //-----------------------------------------------------------------------------
 
-static const char rcsid[] = "$Id: am_map.c 162 2005-10-04 21:41:42Z fraggle $";
+static const char rcsid[] = "$Id: am_map.c 641 2006-09-21 11:13:28Z rtc_marine $";
 
 #include <stdio.h>
 
@@ -486,7 +486,7 @@ void AM_changeWindowLoc(void)
 void AM_initVariables(void)
 {
     int pnum;
-    static event_t st_notify = { ev_keyup, AM_MSGENTERED };
+    static event_t st_notify = { ev_keyup, AM_MSGENTERED, 0, 0 };
 
     automapactive = true;
     fb = screens[0];
@@ -587,7 +587,7 @@ void AM_LevelInit(void)
 //
 void AM_Stop (void)
 {
-    static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED };
+    static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED, 0 };
 
     AM_unloadPics();
     automapactive = false;
diff --git a/src/d_main.c b/src/d_main.c
index ae5d0b30..ba262dde 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_main.c 638 2006-09-20 19:04:02Z fraggle $
+// $Id: d_main.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -184,7 +184,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_main.c 638 2006-09-20 19:04:02Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 641 2006-09-21 11:13:28Z rtc_marine $";
 
 #define	BGCOLOR		7
 #define	FGCOLOR		8
@@ -788,7 +788,7 @@ struct
 
 static char *SearchDirectoryForIWAD(char *dir)
 {
-    int i;
+    size_t i;
 
     for (i=0; i<sizeof(iwads) / sizeof(*iwads); ++i) 
     {
@@ -819,7 +819,7 @@ static char *SearchDirectoryForIWAD(char *dir)
 
 static void IdentifyIWADByName(char *name)
 {
-    int i;
+    size_t i;
 
     gamemission = none;
     
@@ -952,7 +952,7 @@ static char *copyright_banners[] =
 
 static char *GetGameName(char *gamename)
 {
-    int i;
+    size_t i;
     char *deh_sub;
     
     for (i=0; i<sizeof(banners) / sizeof(*banners); ++i)
@@ -1266,7 +1266,7 @@ void PrintBanner(char *msg)
 
 void PrintDehackedBanners(void)
 {
-    int i;
+    size_t i;
 
     for (i=0; i<sizeof(copyright_banners) / sizeof(char *); ++i)
     {
@@ -1354,7 +1354,7 @@ static void SetConfigDir(void)
 
 static void SetSaveGameDir(void)
 {
-    int i;
+    size_t i;
 
     if (!strcmp(configdir, ""))
     {
@@ -1406,7 +1406,7 @@ static struct
     {"Doom 1.9",             "1.9",        exe_doom_1_9},
     {"Ultimate Doom",        "ultimate",   exe_ultimate},
     {"Final Doom",           "final",      exe_final},
-    {NULL},
+    {        "\0",              "\0",              0},
 };
 
 // Initialise the game version
diff --git a/src/deh_cheat.c b/src/deh_cheat.c
index a61a15e6..a5fe2cde 100644
--- a/src/deh_cheat.c
+++ b/src/deh_cheat.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: deh_cheat.c 417 2006-03-11 21:34:19Z fraggle $
+// $Id: deh_cheat.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -79,7 +79,7 @@ static deh_cheat_t allcheats[] =
 
 static deh_cheat_t *FindCheatByName(char *name)
 {
-    int i;
+    size_t i;
     
     for (i=0; i<sizeof(allcheats) / sizeof(*allcheats); ++i)
     {
diff --git a/src/deh_main.c b/src/deh_main.c
index 448d53fa..b3e77426 100644
--- a/src/deh_main.c
+++ b/src/deh_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: deh_main.c 595 2006-09-02 19:02:11Z fraggle $
+// $Id: deh_main.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -220,7 +220,7 @@ boolean DEH_ParseAssignment(char *line, char **variable_name, char **value)
 
 static boolean CheckSignatures(deh_context_t *context)
 {
-    int i;
+    size_t i;
     char *line;
     
     // Read the first line
diff --git a/src/deh_misc.c b/src/deh_misc.c
index 5fb09bdf..b89ad429 100644
--- a/src/deh_misc.c
+++ b/src/deh_misc.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: deh_misc.c 442 2006-03-25 20:08:58Z fraggle $
+// $Id: deh_misc.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -208,7 +208,7 @@ static void DEH_MiscParseLine(deh_context_t *context, char *line, void *tag)
 {
     char *variable_name, *value;
     int ivalue;
-    int i;
+    size_t i;
 
     if (!DEH_ParseAssignment(line, &variable_name, &value))
     {
diff --git a/src/f_finale.c b/src/f_finale.c
index c1b8ce74..4c540b00 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: f_finale.c 330 2006-01-23 00:07:56Z fraggle $
+// $Id: f_finale.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -48,7 +48,7 @@
 
 
 static const char
-rcsid[] = "$Id: f_finale.c 330 2006-01-23 00:07:56Z fraggle $";
+rcsid[] = "$Id: f_finale.c 641 2006-09-21 11:13:28Z rtc_marine $";
 
 #include <ctype.h>
 
@@ -132,7 +132,7 @@ void	F_CastDrawer (void);
 //
 void F_StartFinale (void)
 {
-    int i;
+    size_t i;
 
     gameaction = ga_nothing;
     gamestate = GS_FINALE;
@@ -189,7 +189,7 @@ boolean F_Responder (event_t *event)
 //
 void F_Ticker (void)
 {
-    int		i;
+    size_t		i;
     
     // check for skipping
     if ( (gamemode == commercial)
diff --git a/src/g_game.c b/src/g_game.c
index 3d20d9dc..94a56ff8 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: g_game.c 581 2006-08-31 18:13:04Z fraggle $
+// $Id: g_game.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -134,7 +134,7 @@
 
 
 static const char
-rcsid[] = "$Id: g_game.c 581 2006-08-31 18:13:04Z fraggle $";
+rcsid[] = "$Id: g_game.c 641 2006-09-21 11:13:28Z rtc_marine $";
 
 #include <string.h>
 #include <stdlib.h>
@@ -348,7 +348,7 @@ int             vanilla_demo_limit = 1;
  
 int G_CmdChecksum (ticcmd_t* cmd) 
 { 
-    int		i;
+    size_t		i;
     int		sum = 0; 
 	 
     for (i=0 ; i< sizeof(*cmd)/4 - 1 ; i++) 
diff --git a/src/m_cheat.h b/src/m_cheat.h
index 158dc6e4..26c56b4c 100644
--- a/src/m_cheat.h
+++ b/src/m_cheat.h
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: m_cheat.h 162 2005-10-04 21:41:42Z fraggle $
+// $Id: m_cheat.h 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -37,7 +37,7 @@
 // declaring a cheat
 
 #define CHEAT(value, parameters) \
-    { value, sizeof(value) - 1, parameters, 0, 0 }
+    { value, sizeof(value) - 1, parameters, 0, 0, 0 }
 
 #define MAX_CHEAT_LEN 15
 #define MAX_CHEAT_PARAMS 5
diff --git a/src/m_menu.c b/src/m_menu.c
index 76efffa1..73f8ce21 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: m_menu.c 455 2006-03-30 19:08:37Z fraggle $
+// $Id: m_menu.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -78,7 +78,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: m_menu.c 455 2006-03-30 19:08:37Z fraggle $";
+rcsid[] = "$Id: m_menu.c 641 2006-09-21 11:13:28Z rtc_marine $";
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -408,9 +408,9 @@ menuitem_t OptionsMenu[]=
     {1,"M_MESSG",	M_ChangeMessages,'m'},
     {1,"M_DETAIL",	M_ChangeDetail,'g'},
     {2,"M_SCRNSZ",	M_SizeDisplay,'s'},
-    {-1,"",0},
+    {-1,"",0,'\0'},
     {2,"M_MSENS",	M_ChangeSensitivity,'m'},
-    {-1,"",0},
+    {-1,"",0,'\0'},
     {1,"M_SVOL",	M_Sound,'s'}
 };
 
@@ -484,9 +484,9 @@ enum
 menuitem_t SoundMenu[]=
 {
     {2,"M_SFXVOL",M_SfxVol,'s'},
-    {-1,"",0},
+    {-1,"",0,'\0'},
     {2,"M_MUSVOL",M_MusicVol,'m'},
-    {-1,"",0}
+    {-1,"",0,'\0'}
 };
 
 menu_t  SoundDef =
@@ -1356,7 +1356,7 @@ void M_StopMessage(void)
 //
 int M_StringWidth(char* string)
 {
-    int             i;
+    size_t             i;
     int             w = 0;
     int             c;
 	
@@ -1379,7 +1379,7 @@ int M_StringWidth(char* string)
 //
 int M_StringHeight(char* string)
 {
-    int             i;
+    size_t             i;
     int             h;
     int             height = SHORT(hu_font[0]->height);
 	
diff --git a/src/m_misc.c b/src/m_misc.c
index eb94e05f..4c5dfdf6 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: m_misc.c 608 2006-09-16 00:20:09Z fraggle $
+// $Id: m_misc.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -106,7 +106,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: m_misc.c 608 2006-09-16 00:20:09Z fraggle $";
+rcsid[] = "$Id: m_misc.c 641 2006-09-21 11:13:28Z rtc_marine $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -330,81 +330,82 @@ typedef struct
 
 static default_t	doom_defaults_list[] =
 {
-    {"mouse_sensitivity", &mouseSensitivity},
-    {"sfx_volume",&sfxVolume},
-    {"music_volume",&musicVolume},
-    {"show_messages",&showMessages},
-
-    {"key_right",&key_right, DEFAULT_KEY},
-    {"key_left",&key_left, DEFAULT_KEY},
-    {"key_up",&key_up, DEFAULT_KEY},
-    {"key_down",&key_down, DEFAULT_KEY},
-    {"key_strafeleft",&key_strafeleft, DEFAULT_KEY},
-    {"key_straferight",&key_straferight, DEFAULT_KEY},
-
-    {"key_fire",&key_fire, DEFAULT_KEY},
-    {"key_use",&key_use, DEFAULT_KEY},
-    {"key_strafe",&key_strafe, DEFAULT_KEY},
-    {"key_speed",&key_speed, DEFAULT_KEY},
-
-    {"use_mouse",&usemouse},
-    {"mouseb_fire",&mousebfire},
-    {"mouseb_strafe",&mousebstrafe},
-    {"mouseb_forward",&mousebforward},
-
-    {"use_joystick",&usejoystick},
-    {"joyb_fire",&joybfire},
-    {"joyb_strafe",&joybstrafe},
-    {"joyb_use",&joybuse},
-    {"joyb_speed",&joybspeed},
-
-    {"screenblocks",&screenblocks},
-    {"detaillevel",&detailLevel},
-
-    {"snd_channels",&numChannels},
-
-    {"snd_musicdevice", &snd_musicdevice},
-    {"snd_sfxdevice", &snd_sfxdevice},
-    {"snd_sbport", &snd_sbport},
-    {"snd_sbirq", &snd_sbirq},
-    {"snd_sbdma", &snd_sbdma},
-    {"snd_mport", &snd_mport},
-
-    {"usegamma",&usegamma},
-
-    {"chatmacro0", &chat_macros[0], DEFAULT_STRING },
-    {"chatmacro1", &chat_macros[1], DEFAULT_STRING },
-    {"chatmacro2", &chat_macros[2], DEFAULT_STRING },
-    {"chatmacro3", &chat_macros[3], DEFAULT_STRING },
-    {"chatmacro4", &chat_macros[4], DEFAULT_STRING },
-    {"chatmacro5", &chat_macros[5], DEFAULT_STRING },
-    {"chatmacro6", &chat_macros[6], DEFAULT_STRING },
-    {"chatmacro7", &chat_macros[7], DEFAULT_STRING },
-    {"chatmacro8", &chat_macros[8], DEFAULT_STRING },
-    {"chatmacro9", &chat_macros[9], DEFAULT_STRING },
+    {"mouse_sensitivity", &mouseSensitivity, 0, 0},
+    {"sfx_volume",&sfxVolume, 0, 0},
+    {"music_volume",&musicVolume, 0, 0},
+    {"show_messages",&showMessages, 0, 0},
+
+    {"key_right",&key_right, DEFAULT_KEY, 0},
+    {"key_left",&key_left, DEFAULT_KEY, 0},
+    {"key_up",&key_up, DEFAULT_KEY, 0},
+    {"key_down",&key_down, DEFAULT_KEY, 0},
+    {"key_strafeleft",&key_strafeleft, DEFAULT_KEY, 0},
+    {"key_straferight",&key_straferight, DEFAULT_KEY, 0},
+
+    {"key_fire",&key_fire, DEFAULT_KEY, 0},
+    {"key_use",&key_use, DEFAULT_KEY, 0},
+    {"key_strafe",&key_strafe, DEFAULT_KEY, 0},
+    {"key_speed",&key_speed, DEFAULT_KEY, 0},
+
+    {"use_mouse",&usemouse, 0, 0},
+    {"mouseb_fire",&mousebfire, 0, 0},
+    {"mouseb_strafe",&mousebstrafe, 0, 0},
+    {"mouseb_forward",&mousebforward, 0, 0},
+
+    {"use_joystick",&usejoystick, 0, 0},
+    {"joyb_fire",&joybfire, 0, 0},
+    {"joyb_strafe",&joybstrafe, 0, 0},
+    {"joyb_use",&joybuse, 0, 0},
+    {"joyb_speed",&joybspeed, 0, 0},
+
+    {"screenblocks",&screenblocks, 0, 0},
+    {"detaillevel",&detailLevel, 0, 0},
+
+    {"snd_channels",&numChannels, 0, 0},
+
+    {"snd_musicdevice", &snd_musicdevice, 0, 0},
+    {"snd_sfxdevice", &snd_sfxdevice, 0, 0},
+    {"snd_sbport", &snd_sbport, 0, 0},
+    {"snd_sbirq", &snd_sbirq, 0, 0},
+    {"snd_sbdma", &snd_sbdma, 0, 0},
+    {"snd_mport", &snd_mport, 0, 0},
+
+    {"usegamma",&usegamma, 0, 0},
+
+    {"chatmacro0", &chat_macros[0], DEFAULT_STRING, 0 },
+    {"chatmacro1", &chat_macros[1], DEFAULT_STRING, 0 },
+    {"chatmacro2", &chat_macros[2], DEFAULT_STRING, 0 },
+    {"chatmacro3", &chat_macros[3], DEFAULT_STRING, 0 },
+    {"chatmacro4", &chat_macros[4], DEFAULT_STRING, 0 },
+    {"chatmacro5", &chat_macros[5], DEFAULT_STRING, 0 },
+    {"chatmacro6", &chat_macros[6], DEFAULT_STRING, 0 },
+    {"chatmacro7", &chat_macros[7], DEFAULT_STRING, 0 },
+    {"chatmacro8", &chat_macros[8], DEFAULT_STRING, 0 },
+    {"chatmacro9", &chat_macros[9], DEFAULT_STRING, 0 },
 };
 
 static default_collection_t doom_defaults = 
 {
     doom_defaults_list,
     sizeof(doom_defaults_list) / sizeof(*doom_defaults_list),
+    "\0",
 };
 
 static default_t extra_defaults_list[] = 
 {
-    {"autoadjust_video_settings",   &autoadjust_video_settings},
-    {"fullscreen",                  &fullscreen},
-    {"startup_delay",               &startup_delay},
-    {"screenmultiply",              &screenmultiply},
-    {"grabmouse",                   &grabmouse},
-    {"novert",                      &novert},
-    {"mouse_acceleration",          &mouse_acceleration,       DEFAULT_FLOAT},
-    {"mouse_threshold",             &mouse_threshold},
-    {"show_endoom",                 &show_endoom},
-    {"vanilla_savegame_limit",      &vanilla_savegame_limit},
-    {"vanilla_demo_limit",          &vanilla_demo_limit},
+    {"autoadjust_video_settings",   &autoadjust_video_settings, 0, 0},
+    {"fullscreen",                  &fullscreen, 0, 0},
+    {"startup_delay",               &startup_delay, 0, 0},
+    {"screenmultiply",              &screenmultiply, 0, 0},
+    {"grabmouse",                   &grabmouse, 0, 0},
+    {"novert",                      &novert, 0, 0},
+    {"mouse_acceleration",          &mouse_acceleration,       DEFAULT_FLOAT, 0},
+    {"mouse_threshold",             &mouse_threshold, 0, 0},
+    {"show_endoom",                 &show_endoom, 0, 0},
+    {"vanilla_savegame_limit",      &vanilla_savegame_limit, 0, 0},
+    {"vanilla_demo_limit",          &vanilla_demo_limit, 0, 0},
 #ifdef FEATURE_MULTIPLAYER
-    {"player_name",                 &net_player_name,          DEFAULT_STRING},
+    {"player_name",                 &net_player_name,          DEFAULT_STRING, 0},
 #endif
 };
 
@@ -412,6 +413,7 @@ static default_collection_t extra_defaults =
 {
     extra_defaults_list,
     sizeof(extra_defaults_list) / sizeof(*extra_defaults_list),
+    "\0",
 };
 
 static int scantokey[128] =
diff --git a/src/net_client.c b/src/net_client.c
index b104341a..1c5b7a28 100644
--- a/src/net_client.c
+++ b/src/net_client.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: net_client.c 593 2006-09-01 20:45:45Z fraggle $
+// $Id: net_client.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -596,7 +596,7 @@ static void NET_CL_ParseWaitingData(net_packet_t *packet)
     unsigned int player_number;
     char *player_names[MAXPLAYERS];
     char *player_addr[MAXPLAYERS];
-    int i;
+    size_t i;
 
     if (!NET_ReadInt8(packet, &num_players)
      || !NET_ReadInt8(packet, &is_controller)
@@ -804,7 +804,7 @@ static void NET_CL_ParseGameData(net_packet_t *packet)
     unsigned int seq, num_tics;
     unsigned int nowtime;
     int resend_start, resend_end;
-    int i;
+    size_t i;
     int index;
     
     // Read header
diff --git a/src/net_server.c b/src/net_server.c
index 992a10d0..394dc6c2 100644
--- a/src/net_server.c
+++ b/src/net_server.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: net_server.c 612 2006-09-17 20:37:26Z fraggle $
+// $Id: net_server.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -869,7 +869,7 @@ static void NET_SV_ParseGameData(net_packet_t *packet, net_client_t *client)
     unsigned int seq;
     unsigned int num_tics;
     unsigned int nowtime;
-    int i;
+    size_t i;
     int player;
     int resend_start, resend_end;
     int index;
@@ -1020,7 +1020,7 @@ static void NET_SV_ParseResendRequest(net_packet_t *packet, net_client_t *client
 {
     unsigned int start, last;
     unsigned int num_tics;
-    int i;
+    unsigned int i;
 
     // Read the starting tic and number of tics
 
diff --git a/src/p_inter.c b/src/p_inter.c
index ae5dce60..e6cdf846 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: p_inter.c 282 2006-01-12 00:21:29Z fraggle $
+// $Id: p_inter.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -53,7 +53,7 @@
 
 
 static const char
-rcsid[] = "$Id: p_inter.c 282 2006-01-12 00:21:29Z fraggle $";
+rcsid[] = "$Id: p_inter.c 641 2006-09-21 11:13:28Z rtc_marine $";
 
 
 // Data.
@@ -110,7 +110,7 @@ P_GiveAmmo
     if (ammo == am_noammo)
 	return false;
 		
-    if (ammo < 0 || ammo > NUMAMMO)
+    if (ammo > NUMAMMO)
 	I_Error ("P_GiveAmmo: bad type %i", ammo);
 		
     if ( player->ammo[ammo] == player->maxammo[ammo]  )
diff --git a/src/p_spec.c b/src/p_spec.c
index 6e5df166..1371f2dc 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: p_spec.c 475 2006-05-05 19:49:34Z fraggle $
+// $Id: p_spec.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -45,7 +45,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: p_spec.c 475 2006-05-05 19:49:34Z fraggle $";
+rcsid[] = "$Id: p_spec.c 641 2006-09-21 11:13:28Z rtc_marine $";
 
 #include <stdlib.h>
 
@@ -148,7 +148,7 @@ animdef_t		animdefs[] =
     {true,	"WFALL4",	"WFALL1",	8},
     {true,	"DBRAIN4",	"DBRAIN1",	8},
 	
-    {-1}
+    {  -1,       "\0",       "\0",  0}
 };
 
 anim_t		anims[MAXANIMS];
diff --git a/src/sounds.c b/src/sounds.c
index b9c4d692..4a425c37 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: sounds.c 8 2005-07-23 16:44:57Z fraggle $
+// $Id: sounds.c 641 2006-09-21 11:13:28Z rtc_marine $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -37,7 +37,7 @@
 
 
 static const char 
-rcsid[] = "$Id: sounds.c 8 2005-07-23 16:44:57Z fraggle $";
+rcsid[] = "$Id: sounds.c 641 2006-09-21 11:13:28Z rtc_marine $";
 
 
 #include "doomtype.h"
@@ -49,74 +49,74 @@ rcsid[] = "$Id: sounds.c 8 2005-07-23 16:44:57Z fraggle $";
 
 musicinfo_t S_music[] =
 {
-    { 0 },
-    { "e1m1", 0 },
-    { "e1m2", 0 },
-    { "e1m3", 0 },
-    { "e1m4", 0 },
-    { "e1m5", 0 },
-    { "e1m6", 0 },
-    { "e1m7", 0 },
-    { "e1m8", 0 },
-    { "e1m9", 0 },
-    { "e2m1", 0 },
-    { "e2m2", 0 },
-    { "e2m3", 0 },
-    { "e2m4", 0 },
-    { "e2m5", 0 },
-    { "e2m6", 0 },
-    { "e2m7", 0 },
-    { "e2m8", 0 },
-    { "e2m9", 0 },
-    { "e3m1", 0 },
-    { "e3m2", 0 },
-    { "e3m3", 0 },
-    { "e3m4", 0 },
-    { "e3m5", 0 },
-    { "e3m6", 0 },
-    { "e3m7", 0 },
-    { "e3m8", 0 },
-    { "e3m9", 0 },
-    { "inter", 0 },
-    { "intro", 0 },
-    { "bunny", 0 },
-    { "victor", 0 },
-    { "introa", 0 },
-    { "runnin", 0 },
-    { "stalks", 0 },
-    { "countd", 0 },
-    { "betwee", 0 },
-    { "doom", 0 },
-    { "the_da", 0 },
-    { "shawn", 0 },
-    { "ddtblu", 0 },
-    { "in_cit", 0 },
-    { "dead", 0 },
-    { "stlks2", 0 },
-    { "theda2", 0 },
-    { "doom2", 0 },
-    { "ddtbl2", 0 },
-    { "runni2", 0 },
-    { "dead2", 0 },
-    { "stlks3", 0 },
-    { "romero", 0 },
-    { "shawn2", 0 },
-    { "messag", 0 },
-    { "count2", 0 },
-    { "ddtbl3", 0 },
-    { "ampie", 0 },
-    { "theda3", 0 },
-    { "adrian", 0 },
-    { "messg2", 0 },
-    { "romer2", 0 },
-    { "tense", 0 },
-    { "shawn3", 0 },
-    { "openin", 0 },
-    { "evil", 0 },
-    { "ultima", 0 },
-    { "read_m", 0 },
-    { "dm2ttl", 0 },
-    { "dm2int", 0 } 
+    {   "\0", 0, 0, 0 },
+    { "e1m1", 0, 0, 0 },
+    { "e1m2", 0, 0, 0 },
+    { "e1m3", 0, 0, 0 },
+    { "e1m4", 0, 0, 0 },
+    { "e1m5", 0, 0, 0 },
+    { "e1m6", 0, 0, 0 },
+    { "e1m7", 0, 0, 0 },
+    { "e1m8", 0, 0, 0 },
+    { "e1m9", 0, 0, 0 },
+    { "e2m1", 0, 0, 0 },
+    { "e2m2", 0, 0, 0 },
+    { "e2m3", 0, 0, 0 },
+    { "e2m4", 0, 0, 0 },
+    { "e2m5", 0, 0, 0 },
+    { "e2m6", 0, 0, 0 },
+    { "e2m7", 0, 0, 0 },
+    { "e2m8", 0, 0, 0 },
+    { "e2m9", 0, 0, 0 },
+    { "e3m1", 0, 0, 0 },
+    { "e3m2", 0, 0, 0 },
+    { "e3m3", 0, 0, 0 },
+    { "e3m4", 0, 0, 0 },
+    { "e3m5", 0, 0, 0 },
+    { "e3m6", 0, 0, 0 },
+    { "e3m7", 0, 0, 0 },
+    { "e3m8", 0, 0, 0 },
+    { "e3m9", 0, 0, 0 },
+    { "inter", 0, 0, 0 },
+    { "intro", 0, 0, 0 },
+    { "bunny", 0, 0, 0 },
+    { "victor", 0, 0, 0 },
+    { "introa", 0, 0, 0 },
+    { "runnin", 0, 0, 0 },
+    { "stalks", 0, 0, 0 },
+    { "countd", 0, 0, 0 },
+    { "betwee", 0, 0, 0 },
+    { "doom", 0, 0, 0 },
+    { "the_da", 0, 0, 0 },
+    { "shawn", 0, 0, 0 },
+    { "ddtblu", 0, 0, 0 },
+    { "in_cit", 0, 0, 0 },
+    { "dead", 0, 0, 0 },
+    { "stlks2", 0, 0, 0 },
+    { "theda2", 0, 0, 0 },
+    { "doom2", 0, 0, 0 },
+    { "ddtbl2", 0, 0, 0 },
+    { "runni2", 0, 0, 0 },
+    { "dead2", 0, 0, 0 },
+    { "stlks3", 0, 0, 0 },
+    { "romero", 0, 0, 0 },
+    { "shawn2", 0, 0, 0 },
+    { "messag", 0, 0, 0 },
+    { "count2", 0, 0, 0 },
+    { "ddtbl3", 0, 0, 0 },
+    { "ampie", 0, 0, 0 },
+    { "theda3", 0, 0, 0 },
+    { "adrian", 0, 0, 0 },
+    { "messg2", 0, 0, 0 },
+    { "romer2", 0, 0, 0 },
+    { "tense", 0, 0, 0 },
+    { "shawn3", 0, 0, 0 },
+    { "openin", 0, 0, 0 },
+    { "evil", 0, 0, 0 },
+    { "ultima", 0, 0, 0 },
+    { "read_m", 0, 0, 0 },
+    { "dm2ttl", 0, 0, 0 },
+    { "dm2int", 0, 0, 0 } 
 };
 
 
@@ -127,115 +127,115 @@ musicinfo_t S_music[] =
 sfxinfo_t S_sfx[] =
 {
   // S_sfx[0] needs to be a dummy for odd reasons.
-  { "none", false,  0, 0, -1, -1, 0 },
+  { "none", false,  0, 0, -1, -1, 0, 0, 0 },
 
-  { "pistol", false, 64, 0, -1, -1, 0 },
-  { "shotgn", false, 64, 0, -1, -1, 0 },
-  { "sgcock", false, 64, 0, -1, -1, 0 },
-  { "dshtgn", false, 64, 0, -1, -1, 0 },
-  { "dbopn", false, 64, 0, -1, -1, 0 },
-  { "dbcls", false, 64, 0, -1, -1, 0 },
-  { "dbload", false, 64, 0, -1, -1, 0 },
-  { "plasma", false, 64, 0, -1, -1, 0 },
-  { "bfg", false, 64, 0, -1, -1, 0 },
-  { "sawup", false, 64, 0, -1, -1, 0 },
-  { "sawidl", false, 118, 0, -1, -1, 0 },
-  { "sawful", false, 64, 0, -1, -1, 0 },
-  { "sawhit", false, 64, 0, -1, -1, 0 },
-  { "rlaunc", false, 64, 0, -1, -1, 0 },
-  { "rxplod", false, 70, 0, -1, -1, 0 },
-  { "firsht", false, 70, 0, -1, -1, 0 },
-  { "firxpl", false, 70, 0, -1, -1, 0 },
-  { "pstart", false, 100, 0, -1, -1, 0 },
-  { "pstop", false, 100, 0, -1, -1, 0 },
-  { "doropn", false, 100, 0, -1, -1, 0 },
-  { "dorcls", false, 100, 0, -1, -1, 0 },
-  { "stnmov", false, 119, 0, -1, -1, 0 },
-  { "swtchn", false, 78, 0, -1, -1, 0 },
-  { "swtchx", false, 78, 0, -1, -1, 0 },
-  { "plpain", false, 96, 0, -1, -1, 0 },
-  { "dmpain", false, 96, 0, -1, -1, 0 },
-  { "popain", false, 96, 0, -1, -1, 0 },
-  { "vipain", false, 96, 0, -1, -1, 0 },
-  { "mnpain", false, 96, 0, -1, -1, 0 },
-  { "pepain", false, 96, 0, -1, -1, 0 },
-  { "slop", false, 78, 0, -1, -1, 0 },
-  { "itemup", true, 78, 0, -1, -1, 0 },
-  { "wpnup", true, 78, 0, -1, -1, 0 },
-  { "oof", false, 96, 0, -1, -1, 0 },
-  { "telept", false, 32, 0, -1, -1, 0 },
-  { "posit1", true, 98, 0, -1, -1, 0 },
-  { "posit2", true, 98, 0, -1, -1, 0 },
-  { "posit3", true, 98, 0, -1, -1, 0 },
-  { "bgsit1", true, 98, 0, -1, -1, 0 },
-  { "bgsit2", true, 98, 0, -1, -1, 0 },
-  { "sgtsit", true, 98, 0, -1, -1, 0 },
-  { "cacsit", true, 98, 0, -1, -1, 0 },
-  { "brssit", true, 94, 0, -1, -1, 0 },
-  { "cybsit", true, 92, 0, -1, -1, 0 },
-  { "spisit", true, 90, 0, -1, -1, 0 },
-  { "bspsit", true, 90, 0, -1, -1, 0 },
-  { "kntsit", true, 90, 0, -1, -1, 0 },
-  { "vilsit", true, 90, 0, -1, -1, 0 },
-  { "mansit", true, 90, 0, -1, -1, 0 },
-  { "pesit", true, 90, 0, -1, -1, 0 },
-  { "sklatk", false, 70, 0, -1, -1, 0 },
-  { "sgtatk", false, 70, 0, -1, -1, 0 },
-  { "skepch", false, 70, 0, -1, -1, 0 },
-  { "vilatk", false, 70, 0, -1, -1, 0 },
-  { "claw", false, 70, 0, -1, -1, 0 },
-  { "skeswg", false, 70, 0, -1, -1, 0 },
-  { "pldeth", false, 32, 0, -1, -1, 0 },
-  { "pdiehi", false, 32, 0, -1, -1, 0 },
-  { "podth1", false, 70, 0, -1, -1, 0 },
-  { "podth2", false, 70, 0, -1, -1, 0 },
-  { "podth3", false, 70, 0, -1, -1, 0 },
-  { "bgdth1", false, 70, 0, -1, -1, 0 },
-  { "bgdth2", false, 70, 0, -1, -1, 0 },
-  { "sgtdth", false, 70, 0, -1, -1, 0 },
-  { "cacdth", false, 70, 0, -1, -1, 0 },
-  { "skldth", false, 70, 0, -1, -1, 0 },
-  { "brsdth", false, 32, 0, -1, -1, 0 },
-  { "cybdth", false, 32, 0, -1, -1, 0 },
-  { "spidth", false, 32, 0, -1, -1, 0 },
-  { "bspdth", false, 32, 0, -1, -1, 0 },
-  { "vildth", false, 32, 0, -1, -1, 0 },
-  { "kntdth", false, 32, 0, -1, -1, 0 },
-  { "pedth", false, 32, 0, -1, -1, 0 },
-  { "skedth", false, 32, 0, -1, -1, 0 },
-  { "posact", true, 120, 0, -1, -1, 0 },
-  { "bgact", true, 120, 0, -1, -1, 0 },
-  { "dmact", true, 120, 0, -1, -1, 0 },
-  { "bspact", true, 100, 0, -1, -1, 0 },
-  { "bspwlk", true, 100, 0, -1, -1, 0 },
-  { "vilact", true, 100, 0, -1, -1, 0 },
-  { "noway", false, 78, 0, -1, -1, 0 },
-  { "barexp", false, 60, 0, -1, -1, 0 },
-  { "punch", false, 64, 0, -1, -1, 0 },
-  { "hoof", false, 70, 0, -1, -1, 0 },
-  { "metal", false, 70, 0, -1, -1, 0 },
-  { "chgun", false, 64, &S_sfx[sfx_pistol], 150, 0, 0 },
-  { "tink", false, 60, 0, -1, -1, 0 },
-  { "bdopn", false, 100, 0, -1, -1, 0 },
-  { "bdcls", false, 100, 0, -1, -1, 0 },
-  { "itmbk", false, 100, 0, -1, -1, 0 },
-  { "flame", false, 32, 0, -1, -1, 0 },
-  { "flamst", false, 32, 0, -1, -1, 0 },
-  { "getpow", false, 60, 0, -1, -1, 0 },
-  { "bospit", false, 70, 0, -1, -1, 0 },
-  { "boscub", false, 70, 0, -1, -1, 0 },
-  { "bossit", false, 70, 0, -1, -1, 0 },
-  { "bospn", false, 70, 0, -1, -1, 0 },
-  { "bosdth", false, 70, 0, -1, -1, 0 },
-  { "manatk", false, 70, 0, -1, -1, 0 },
-  { "mandth", false, 70, 0, -1, -1, 0 },
-  { "sssit", false, 70, 0, -1, -1, 0 },
-  { "ssdth", false, 70, 0, -1, -1, 0 },
-  { "keenpn", false, 70, 0, -1, -1, 0 },
-  { "keendt", false, 70, 0, -1, -1, 0 },
-  { "skeact", false, 70, 0, -1, -1, 0 },
-  { "skesit", false, 70, 0, -1, -1, 0 },
-  { "skeatk", false, 70, 0, -1, -1, 0 },
-  { "radio", false, 60, 0, -1, -1, 0 } 
+  { "pistol", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "shotgn", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "sgcock", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "dshtgn", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "dbopn", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "dbcls", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "dbload", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "plasma", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "bfg", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "sawup", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "sawidl", false, 118, 0, -1, -1, 0, 0, 0 },
+  { "sawful", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "sawhit", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "rlaunc", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "rxplod", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "firsht", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "firxpl", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "pstart", false, 100, 0, -1, -1, 0, 0, 0 },
+  { "pstop", false, 100, 0, -1, -1, 0, 0, 0 },
+  { "doropn", false, 100, 0, -1, -1, 0, 0, 0 },
+  { "dorcls", false, 100, 0, -1, -1, 0, 0, 0 },
+  { "stnmov", false, 119, 0, -1, -1, 0, 0, 0 },
+  { "swtchn", false, 78, 0, -1, -1, 0, 0, 0 },
+  { "swtchx", false, 78, 0, -1, -1, 0, 0, 0 },
+  { "plpain", false, 96, 0, -1, -1, 0, 0, 0 },
+  { "dmpain", false, 96, 0, -1, -1, 0, 0, 0 },
+  { "popain", false, 96, 0, -1, -1, 0, 0, 0 },
+  { "vipain", false, 96, 0, -1, -1, 0, 0, 0 },
+  { "mnpain", false, 96, 0, -1, -1, 0, 0, 0 },
+  { "pepain", false, 96, 0, -1, -1, 0, 0, 0 },
+  { "slop", false, 78, 0, -1, -1, 0, 0, 0 },
+  { "itemup", true, 78, 0, -1, -1, 0, 0, 0 },
+  { "wpnup", true, 78, 0, -1, -1, 0, 0, 0 },
+  { "oof", false, 96, 0, -1, -1, 0, 0, 0 },
+  { "telept", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "posit1", true, 98, 0, -1, -1, 0, 0, 0 },
+  { "posit2", true, 98, 0, -1, -1, 0, 0, 0 },
+  { "posit3", true, 98, 0, -1, -1, 0, 0, 0 },
+  { "bgsit1", true, 98, 0, -1, -1, 0, 0, 0 },
+  { "bgsit2", true, 98, 0, -1, -1, 0, 0, 0 },
+  { "sgtsit", true, 98, 0, -1, -1, 0, 0, 0 },
+  { "cacsit", true, 98, 0, -1, -1, 0, 0, 0 },
+  { "brssit", true, 94, 0, -1, -1, 0, 0, 0 },
+  { "cybsit", true, 92, 0, -1, -1, 0, 0, 0 },
+  { "spisit", true, 90, 0, -1, -1, 0, 0, 0 },
+  { "bspsit", true, 90, 0, -1, -1, 0, 0, 0 },
+  { "kntsit", true, 90, 0, -1, -1, 0, 0, 0 },
+  { "vilsit", true, 90, 0, -1, -1, 0, 0, 0 },
+  { "mansit", true, 90, 0, -1, -1, 0, 0, 0 },
+  { "pesit", true, 90, 0, -1, -1, 0, 0, 0 },
+  { "sklatk", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "sgtatk", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "skepch", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "vilatk", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "claw", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "skeswg", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "pldeth", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "pdiehi", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "podth1", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "podth2", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "podth3", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "bgdth1", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "bgdth2", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "sgtdth", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "cacdth", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "skldth", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "brsdth", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "cybdth", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "spidth", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "bspdth", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "vildth", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "kntdth", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "pedth", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "skedth", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "posact", true, 120, 0, -1, -1, 0, 0, 0 },
+  { "bgact", true, 120, 0, -1, -1, 0, 0, 0 },
+  { "dmact", true, 120, 0, -1, -1, 0, 0, 0 },
+  { "bspact", true, 100, 0, -1, -1, 0, 0, 0 },
+  { "bspwlk", true, 100, 0, -1, -1, 0, 0, 0 },
+  { "vilact", true, 100, 0, -1, -1, 0, 0, 0 },
+  { "noway", false, 78, 0, -1, -1, 0, 0, 0 },
+  { "barexp", false, 60, 0, -1, -1, 0, 0, 0 },
+  { "punch", false, 64, 0, -1, -1, 0, 0, 0 },
+  { "hoof", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "metal", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "chgun", false, 64, &S_sfx[sfx_pistol], 150, 0, 0, 0, 0 },
+  { "tink", false, 60, 0, -1, -1, 0, 0, 0 },
+  { "bdopn", false, 100, 0, -1, -1, 0, 0, 0 },
+  { "bdcls", false, 100, 0, -1, -1, 0, 0, 0 },
+  { "itmbk", false, 100, 0, -1, -1, 0, 0, 0 },
+  { "flame", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "flamst", false, 32, 0, -1, -1, 0, 0, 0 },
+  { "getpow", false, 60, 0, -1, -1, 0, 0, 0 },
+  { "bospit", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "boscub", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "bossit", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "bospn", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "bosdth", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "manatk", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "mandth", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "sssit", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "ssdth", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "keenpn", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "keendt", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "skeact", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "skesit", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "skeatk", false, 70, 0, -1, -1, 0, 0, 0 },
+  { "radio", false, 60, 0, -1, -1, 0, 0, 0 } 
 };
 
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] =
diff --git a/textscreen/txt_button.c b/textscreen/txt_button.c
index 9e5b6d0d..e8420558 100644
--- a/textscreen/txt_button.c
+++ b/textscreen/txt_button.c
@@ -101,6 +101,7 @@ txt_widget_class_t txt_button_class =
     TXT_ButtonKeyPress,
     TXT_ButtonDestructor,
     TXT_ButtonMousePress,
+    0,
 };
 
 void TXT_SetButtonLabel(txt_button_t *button, char *label)
diff --git a/textscreen/txt_checkbox.c b/textscreen/txt_checkbox.c
index bb26211f..37fb0747 100644
--- a/textscreen/txt_checkbox.c
+++ b/textscreen/txt_checkbox.c
@@ -122,6 +122,7 @@ txt_widget_class_t txt_checkbox_class =
     TXT_CheckBoxKeyPress,
     TXT_CheckBoxDestructor,
     TXT_CheckBoxMousePress,
+    0,
 };
 
 txt_checkbox_t *TXT_NewCheckBox(char *label, int *variable)
diff --git a/textscreen/txt_dropdown.c b/textscreen/txt_dropdown.c
index 0dbdec4d..504d4156 100644
--- a/textscreen/txt_dropdown.c
+++ b/textscreen/txt_dropdown.c
@@ -265,6 +265,7 @@ txt_widget_class_t txt_dropdown_list_class =
     TXT_DropdownListKeyPress,
     TXT_DropdownListDestructor,
     TXT_DropdownListMousePress,
+    0,
 };
 
 txt_dropdown_list_t *TXT_NewDropdownList(int *variable, char **values, 
diff --git a/textscreen/txt_inputbox.c b/textscreen/txt_inputbox.c
index c3f4f255..4ef1300c 100644
--- a/textscreen/txt_inputbox.c
+++ b/textscreen/txt_inputbox.c
@@ -235,6 +235,7 @@ txt_widget_class_t txt_inputbox_class =
     TXT_InputBoxKeyPress,
     TXT_InputBoxDestructor,
     TXT_InputBoxMousePress,
+    0,
 };
 
 txt_widget_class_t txt_int_inputbox_class =
@@ -244,6 +245,7 @@ txt_widget_class_t txt_int_inputbox_class =
     TXT_IntInputBoxKeyPress,
     TXT_InputBoxDestructor,
     TXT_InputBoxMousePress,
+    0,
 };
 
 static void SetBufferFromValue(txt_inputbox_t *inputbox)
diff --git a/textscreen/txt_io.c b/textscreen/txt_io.c
index 96a6e911..1e8106e7 100644
--- a/textscreen/txt_io.c
+++ b/textscreen/txt_io.c
@@ -59,7 +59,7 @@ static txt_color_t bgcolor = TXT_COLOR_BLACK;
 
 static int GetColorForName(char *s)
 {
-    int i;
+    size_t i;
 
     for (i=0; i<sizeof(colors) / sizeof(*colors); ++i)
     {
diff --git a/textscreen/txt_label.c b/textscreen/txt_label.c
index 86250372..19a9646e 100644
--- a/textscreen/txt_label.c
+++ b/textscreen/txt_label.c
@@ -108,6 +108,7 @@ txt_widget_class_t txt_label_class =
     TXT_LabelDrawer,
     NULL,
     TXT_LabelDestructor,
+    0,
 };
 
 void TXT_SetLabel(txt_label_t *label, char *value)
diff --git a/textscreen/txt_main.c b/textscreen/txt_main.c
index 72760449..a4a7f7e3 100644
--- a/textscreen/txt_main.c
+++ b/textscreen/txt_main.c
@@ -47,22 +47,22 @@ static unsigned char *screendata;
 
 static SDL_Color ega_colors[] = 
 {
-    {0x00, 0x00, 0x00},          // 0: Black
-    {0x00, 0x00, 0xa8},          // 1: Blue
-    {0x00, 0xa8, 0x00},          // 2: Green
-    {0x00, 0xa8, 0xa8},          // 3: Cyan
-    {0xa8, 0x00, 0x00},          // 4: Red
-    {0xa8, 0x00, 0xa8},          // 5: Magenta
-    {0xa8, 0x54, 0x00},          // 6: Brown
-    {0xa8, 0xa8, 0xa8},          // 7: Grey
-    {0x54, 0x54, 0x54},          // 8: Dark grey
-    {0x54, 0x54, 0xfe},          // 9: Bright blue
-    {0x54, 0xfe, 0x54},          // 10: Bright green
-    {0x54, 0xfe, 0xfe},          // 11: Bright cyan
-    {0xfe, 0x54, 0x54},          // 12: Bright red
-    {0xfe, 0x54, 0xfe},          // 13: Bright magenta
-    {0xfe, 0xfe, 0x54},          // 14: Yellow
-    {0xfe, 0xfe, 0xfe},          // 15: Bright white
+    {0x00, 0x00, 0x00, 0x00},          // 0: Black
+    {0x00, 0x00, 0xa8, 0x00},          // 1: Blue
+    {0x00, 0xa8, 0x00, 0x00},          // 2: Green
+    {0x00, 0xa8, 0xa8, 0x00},          // 3: Cyan
+    {0xa8, 0x00, 0x00, 0x00},          // 4: Red
+    {0xa8, 0x00, 0xa8, 0x00},          // 5: Magenta
+    {0xa8, 0x54, 0x00, 0x00},          // 6: Brown
+    {0xa8, 0xa8, 0xa8, 0x00},          // 7: Grey
+    {0x54, 0x54, 0x54, 0x00},          // 8: Dark grey
+    {0x54, 0x54, 0xfe, 0x00},          // 9: Bright blue
+    {0x54, 0xfe, 0x54, 0x00},          // 10: Bright green
+    {0x54, 0xfe, 0xfe, 0x00},          // 11: Bright cyan
+    {0xfe, 0x54, 0x54, 0x00},          // 12: Bright red
+    {0xfe, 0x54, 0xfe, 0x00},          // 13: Bright magenta
+    {0xfe, 0xfe, 0x54, 0x00},          // 14: Yellow
+    {0xfe, 0xfe, 0xfe, 0x00},          // 15: Bright white
 };
 
 //
diff --git a/textscreen/txt_radiobutton.c b/textscreen/txt_radiobutton.c
index 411772f0..374220b3 100644
--- a/textscreen/txt_radiobutton.c
+++ b/textscreen/txt_radiobutton.c
@@ -126,6 +126,7 @@ txt_widget_class_t txt_radiobutton_class =
     TXT_RadioButtonKeyPress,
     TXT_RadioButtonDestructor,
     TXT_RadioButtonMousePress,
+    0,
 };
 
 txt_radiobutton_t *TXT_NewRadioButton(char *label, int *variable, int value)
diff --git a/textscreen/txt_separator.c b/textscreen/txt_separator.c
index 690873a7..97d4c255 100644
--- a/textscreen/txt_separator.c
+++ b/textscreen/txt_separator.c
@@ -86,6 +86,7 @@ txt_widget_class_t txt_separator_class =
     TXT_SeparatorDrawer,
     NULL,
     TXT_SeparatorDestructor,
+    0,
 };
 
 txt_separator_t *TXT_NewSeparator(char *label)
diff --git a/textscreen/txt_spinctrl.c b/textscreen/txt_spinctrl.c
index 44c59815..53ac589d 100644
--- a/textscreen/txt_spinctrl.c
+++ b/textscreen/txt_spinctrl.c
@@ -164,6 +164,7 @@ txt_widget_class_t txt_spincontrol_class =
     TXT_SpinControlKeyPress,
     TXT_SpinControlDestructor,
     TXT_SpinControlMousePress,
+    0,
 };
 
 txt_spincontrol_t *TXT_NewSpinControl(int *value, int min, int max)
diff --git a/textscreen/txt_strut.c b/textscreen/txt_strut.c
index a3fb9084..f2daaa9b 100644
--- a/textscreen/txt_strut.c
+++ b/textscreen/txt_strut.c
@@ -59,6 +59,7 @@ txt_widget_class_t txt_strut_class =
     TXT_StrutDrawer,
     TXT_StrutKeyPress,
     TXT_StrutDestructor,
+    0,
 };
 
 txt_strut_t *TXT_NewStrut(int width, int height)
diff --git a/textscreen/txt_window_action.c b/textscreen/txt_window_action.c
index 473f792d..91ecdcde 100644
--- a/textscreen/txt_window_action.c
+++ b/textscreen/txt_window_action.c
@@ -98,6 +98,7 @@ txt_widget_class_t txt_window_action_class =
     TXT_WindowActionKeyPress,
     TXT_WindowActionDestructor,
     TXT_WindowActionMousePress,
+    0,
 };
 
 txt_window_action_t *TXT_NewWindowAction(int key, char *label)