From f43da62c3ea7bd202fda900760045c3ca5349132 Mon Sep 17 00:00:00 2001
From: Goober5000 <Goober5000@387891d4-d844-0410-90c0-e4c51a9137d3>
Date: Wed, 31 Mar 2004 05:42:29 +0000
Subject: [PATCH] got rid of all those nasty warnings from xlocale and so
 forth; also added comments for #pragma warning disable to indicate the
 message being disabled --Goober5000

---
 fs2_open/code/asteroid/asteroid.cpp           | 10 ++++++---
 fs2_open/code/debris/debris.cpp               | 10 ++++++---
 fs2_open/code/debugconsole/dbugfile.cpp       |  2 +-
 .../exceptionhandler/exceptionhandler.cpp     | 13 ++++++++----
 fs2_open/code/fs2open_pxo/Client.h            | 21 +++++++++++--------
 fs2_open/code/fs2open_pxo/TCP_Client.cpp      | 15 +++++++++----
 fs2_open/code/fs2open_pxo/TCP_Socket.cpp      | 20 +++++++++++-------
 fs2_open/code/fs2open_pxo/TCP_Socket.h        | 14 ++++++++++---
 fs2_open/code/fs2open_pxo/protocol.h          | 11 ++++++----
 fs2_open/code/fs2open_pxo/udpsocket.cpp       | 12 ++++++++---
 fs2_open/code/fs2open_pxo/udpsocket.h         | 13 +++++++++---
 fs2_open/code/hud/hudconfig.cpp               | 14 ++++++++-----
 fs2_open/code/io/swff_lib.cpp                 |  4 ++--
 fs2_open/code/irc/irc.cpp                     | 14 ++++++++-----
 fs2_open/code/irc/irc.h                       | 12 ++++++++---
 fs2_open/code/mission/missionhotkey.cpp       | 12 +++++++----
 fs2_open/code/model/modelread.cpp             | 11 ++++++----
 fs2_open/code/network/fs2ox.cpp               | 13 +++++++-----
 fs2_open/code/network/multi.cpp               | 13 +++++++++---
 fs2_open/code/network/multimsgs.cpp           | 16 +++++++++++---
 fs2_open/code/network/multiutil.cpp           | 12 ++++++++---
 fs2_open/code/network/stand_gui.cpp           | 11 ++++++++--
 fs2_open/code/osapi/osapi.cpp                 | 12 +++++++----
 fs2_open/code/osapi/outwnd.cpp                | 13 ++++++++----
 fs2_open/code/sound/fsspeech.cpp              |  2 +-
 fs2_open/code/species_defs/species_defs.cpp   | 10 ++++++---
 26 files changed, 214 insertions(+), 96 deletions(-)

diff --git a/fs2_open/code/asteroid/asteroid.cpp b/fs2_open/code/asteroid/asteroid.cpp
index 3086eac961..d5ecae4855 100644
--- a/fs2_open/code/asteroid/asteroid.cpp
+++ b/fs2_open/code/asteroid/asteroid.cpp
@@ -9,13 +9,17 @@
 
 /*
  * $Logfile: /Freespace2/code/Asteroid/Asteroid.cpp $
- * $Revision: 2.6 $
- * $Date: 2004-03-05 09:01:53 $
+ * $Revision: 2.7 $
+ * $Date: 2004-03-31 05:42:25 $
  * $Author: Goober5000 $
  *
  * C module for asteroid code
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.6  2004/03/05 09:01:53  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
  * Revision 2.5  2004/02/14 00:18:29  randomtiger
  * Please note that from now on OGL will only run with a registry set by Launcher v4. See forum for details.
  * OK, these changes effect a lot of file, I suggest everyone updates ASAP:
@@ -1222,7 +1226,7 @@ void asteroid_process_pre( object *objp, float frame_time)
 }
 
 #pragma warning ( push )
-#pragma warning ( disable : 4701 )
+#pragma warning ( disable : 4701 )	// possible use of variable without initialization
 int asteroid_check_collision(object *pasteroid, object *other_obj, vector *hitpos, collision_info_struct *asteroid_hit_info)
 {
 	if (!Asteroids_enabled) {
diff --git a/fs2_open/code/debris/debris.cpp b/fs2_open/code/debris/debris.cpp
index ee1817c0be..74e449e77e 100644
--- a/fs2_open/code/debris/debris.cpp
+++ b/fs2_open/code/debris/debris.cpp
@@ -9,13 +9,17 @@
 
 /*
  * $Logfile: /Freespace2/code/Debris/Debris.cpp $
- * $Revision: 2.5 $
- * $Date: 2004-03-05 09:01:59 $
+ * $Revision: 2.6 $
+ * $Date: 2004-03-31 05:42:26 $
  * $Author: Goober5000 $
  *
  * Code for the pieces of exploding object debris.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.5  2004/03/05 09:01:59  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
  * Revision 2.4  2003/10/15 22:03:24  Kazan
  * Da Species Update :D
  *
@@ -1042,7 +1046,7 @@ void debris_hit(object *debris_obj, object *other_obj, vector *hitpos, float dam
 //	Return true if hit, else return false.
 //
 #pragma warning ( push )
-#pragma warning ( disable : 4701 )
+#pragma warning ( disable : 4701 )	// possible use of variable without initialization
 int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, collision_info_struct *debris_hit_info)
 {
 	mc_info	mc;
diff --git a/fs2_open/code/debugconsole/dbugfile.cpp b/fs2_open/code/debugconsole/dbugfile.cpp
index 2e6fdecec9..37465d858b 100644
--- a/fs2_open/code/debugconsole/dbugfile.cpp
+++ b/fs2_open/code/debugconsole/dbugfile.cpp
@@ -9,7 +9,7 @@
 
 #include "dbugfile.h"
 
-#pragma warning(disable:4711)
+#pragma warning(disable:4711)	// function selected for inlining
 
 int  dbugfile_counters[MAX_COUNTERS];
 bool dbugfile_init_var = false;
diff --git a/fs2_open/code/exceptionhandler/exceptionhandler.cpp b/fs2_open/code/exceptionhandler/exceptionhandler.cpp
index 11319c00a6..9aec837cbe 100644
--- a/fs2_open/code/exceptionhandler/exceptionhandler.cpp
+++ b/fs2_open/code/exceptionhandler/exceptionhandler.cpp
@@ -9,13 +9,18 @@
 
 /*
  * $Logfile: /Freespace2/code/ExceptionHandler/ExceptionHandler.cpp $
- * $Revision: 2.4 $
- * $Date: 2004-03-06 23:28:22 $
- * $Author: bobboau $
+ * $Revision: 2.5 $
+ * $Date: 2004-03-31 05:42:26 $
+ * $Author: Goober5000 $
  *
  * Main file for dealing with exception handling
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.4  2004/03/06 23:28:22  bobboau
+ * fixed motion debris
+ * animated laser textures
+ * and added a new error check called a safepoint, mostly for tracking the 'Y bug'
+ *
  * Revision 2.3  2003/11/11 02:15:43  Goober5000
  * ubercommit - basically spelling and language fixes with some additional
  * warnings disabled
@@ -63,7 +68,7 @@ on how to hook it in.
 
 #include <windows.h>
 
-#pragma warning(disable:4711)
+#pragma warning(disable:4711)	// function selected for inlining
 
 // --------------------
 //
diff --git a/fs2_open/code/fs2open_pxo/Client.h b/fs2_open/code/fs2open_pxo/Client.h
index a1a4fde81f..30c52bf129 100644
--- a/fs2_open/code/fs2open_pxo/Client.h
+++ b/fs2_open/code/fs2open_pxo/Client.h
@@ -10,12 +10,15 @@
 
 /*
  * $Logfile: /Freespace2/code/fs2open_pxo/Client.h $
- * $Revision: 1.13 $
- * $Date: 2004-03-09 00:02:16 $
- * $Author: Kazan $
+ * $Revision: 1.14 $
+ * $Date: 2004-03-31 05:42:26 $
+ * $Author: Goober5000 $
  *
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.13  2004/03/09 00:02:16  Kazan
+ * more fs2netd stuff
+ *
  * Revision 1.12  2004/03/07 23:07:20  Kazan
  * [Incomplete] Readd of Software renderer so Standalone server works
  *
@@ -46,12 +49,12 @@
  *
  */
 
-#pragma warning(disable:4018)
-#pragma warning(disable:4100)
-#pragma warning(disable:4511)
-#pragma warning(disable:4512)
-#pragma warning(disable:4663)
-#pragma warning(disable:4710)
+#pragma warning(disable:4018)	// signed/unsigned mismatch
+#pragma warning(disable:4100)	// unreferenced formal parameter
+#pragma warning(disable:4511)	// copy constructor could not be generated
+#pragma warning(disable:4512)	// assignment operator could not be generated
+#pragma warning(disable:4663)	// new template specification syntax
+#pragma warning(disable:4710)	// function not inlined
 
 #if !defined(__pxo_client_h_)
 #define __pxo_client_h_
diff --git a/fs2_open/code/fs2open_pxo/TCP_Client.cpp b/fs2_open/code/fs2open_pxo/TCP_Client.cpp
index 594b4864b6..8408f82ba0 100644
--- a/fs2_open/code/fs2open_pxo/TCP_Client.cpp
+++ b/fs2_open/code/fs2open_pxo/TCP_Client.cpp
@@ -11,11 +11,15 @@
 
 /*
  * $Logfile: /Freespace2/code/fs2open_pxo/TCP_Client.cpp $
- * $Revision: 1.14 $
- * $Date: 2004-03-09 17:59:01 $
- * $Author: Kazan $
+ * $Revision: 1.15 $
+ * $Date: 2004-03-31 05:42:26 $
+ * $Author: Goober5000 $
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.14  2004/03/09 17:59:01  Kazan
+ * Disabled multithreaded TCP_Socket in favor of safer single threaded
+ * FS2NetD doesn't kill the game on connection failure now - just gives warning message and effectively dsiables itself until they try to connect again
+ *
  * Revision 1.13  2004/03/08 15:06:23  Kazan
  * Did, undo
  *
@@ -66,8 +70,11 @@
  *
  */
 
-
+// 4018 = signed/unsigned mismatch
+// 4663 = new template specification syntax
+// 4245 = signed/unsigned mismatch in conversion of const value
 #pragma warning(disable: 4663 4018 4663 4245)
+
 #include "Client.h"
 #include "protocol.h"
 #include "TCP_Socket.h"
diff --git a/fs2_open/code/fs2open_pxo/TCP_Socket.cpp b/fs2_open/code/fs2open_pxo/TCP_Socket.cpp
index 2fe1d3ff1b..07856cd15e 100644
--- a/fs2_open/code/fs2open_pxo/TCP_Socket.cpp
+++ b/fs2_open/code/fs2open_pxo/TCP_Socket.cpp
@@ -10,12 +10,16 @@
 
 /*
  * $Logfile: /Freespace2/code/fs2open_pxo/TCP_Socket.cpp $
- * $Revision: 1.8 $
- * $Date: 2004-03-09 17:59:01 $
- * $Author: Kazan $
+ * $Revision: 1.9 $
+ * $Date: 2004-03-31 05:42:26 $
+ * $Author: Goober5000 $
  *
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.8  2004/03/09 17:59:01  Kazan
+ * Disabled multithreaded TCP_Socket in favor of safer single threaded
+ * FS2NetD doesn't kill the game on connection failure now - just gives warning message and effectively dsiables itself until they try to connect again
+ *
  * Revision 1.7  2004/03/05 09:01:56  Goober5000
  * Uber pass at reducing #includes
  * --Goober5000
@@ -43,10 +47,10 @@
  *
  */
 
-#pragma warning(disable:4100)
-#pragma warning(disable:4511)
-#pragma warning(disable:4512)
-#pragma warning(disable:4711)
+#pragma warning(disable:4100)	// unreferenced formal parameter
+#pragma warning(disable:4511)	// copy constructor could not be generated
+#pragma warning(disable:4512)	// assignment operator could not be generated
+#pragma warning(disable:4711)	// function selected for inlining
 
 #include "TCP_Socket.h"
 //#include <process.h>
@@ -198,7 +202,7 @@ bool TCP_Socket::InitSocket(std::string rem_host, int rem_port)
 }
 
 #pragma warning(push)
-#pragma warning(disable:4127)
+#pragma warning(disable:4127)	// conditional expression is constant
 bool TCP_Socket::DataReady()
 {
 	timeval wait;
diff --git a/fs2_open/code/fs2open_pxo/TCP_Socket.h b/fs2_open/code/fs2open_pxo/TCP_Socket.h
index 47bb0dafa9..ff129b3500 100644
--- a/fs2_open/code/fs2open_pxo/TCP_Socket.h
+++ b/fs2_open/code/fs2open_pxo/TCP_Socket.h
@@ -11,12 +11,16 @@
 
 /*
  * $Logfile: /Freespace2/code/fs2open_pxo/TCP_Socket.h $
- * $Revision: 1.5 $
- * $Date: 2004-03-09 17:59:01 $
- * $Author: Kazan $
+ * $Revision: 1.6 $
+ * $Date: 2004-03-31 05:42:26 $
+ * $Author: Goober5000 $
  *
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.5  2004/03/09 17:59:01  Kazan
+ * Disabled multithreaded TCP_Socket in favor of safer single threaded
+ * FS2NetD doesn't kill the game on connection failure now - just gives warning message and effectively dsiables itself until they try to connect again
+ *
  * Revision 1.4  2004/02/21 00:59:43  Kazan
  * FS2NETD License Comments
  *
@@ -37,7 +41,11 @@
 // Windows Version
 #include <windows.h>
 #include <process.h>
+
+#pragma warning(push, 2)	// ignore all those warnings for Microsoft stuff
 #include <string>
+#pragma warning(pop)
+
 //#include <winsock2.h>
 
 #if !defined(STYPE)
diff --git a/fs2_open/code/fs2open_pxo/protocol.h b/fs2_open/code/fs2open_pxo/protocol.h
index d96937317b..bc41cd778a 100644
--- a/fs2_open/code/fs2open_pxo/protocol.h
+++ b/fs2_open/code/fs2open_pxo/protocol.h
@@ -10,12 +10,15 @@
 
 /*
  * $Logfile: /Freespace2/code/fs2open_pxo/protocol.h $
- * $Revision: 1.10 $
- * $Date: 2004-03-07 23:07:20 $
- * $Author: Kazan $
+ * $Revision: 1.11 $
+ * $Date: 2004-03-31 05:42:26 $
+ * $Author: Goober5000 $
  *
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.10  2004/03/07 23:07:20  Kazan
+ * [Incomplete] Readd of Software renderer so Standalone server works
+ *
  * Revision 1.9  2004/02/21 00:59:43  Kazan
  * FS2NETD License Comments
  *
@@ -36,7 +39,7 @@
 #if !defined(__pxo_protocol_h_)
 #define __pxo_protocol_h_
 
-#pragma warning(disable:4663)
+#pragma warning(disable:4663)	// new template specification syntax
 
 #define PXO_PROTO_VER "1.2"
 // PUT the Protocol into TCP mode
diff --git a/fs2_open/code/fs2open_pxo/udpsocket.cpp b/fs2_open/code/fs2open_pxo/udpsocket.cpp
index 5c52204560..cc68a79b1b 100644
--- a/fs2_open/code/fs2open_pxo/udpsocket.cpp
+++ b/fs2_open/code/fs2open_pxo/udpsocket.cpp
@@ -10,12 +10,15 @@
 
 /*
  * $Logfile: /Freespace2/code/fs2open_pxo/udpsocket.cpp $
- * $Revision: 1.4 $
- * $Date: 2004-02-21 00:59:43 $
- * $Author: Kazan $
+ * $Revision: 1.5 $
+ * $Date: 2004-03-31 05:42:26 $
+ * $Author: Goober5000 $
  *
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.4  2004/02/21 00:59:43  Kazan
+ * FS2NETD License Comments
+ *
  * Revision 1.3  2003/11/11 02:15:42  Goober5000
  * ubercommit - basically spelling and language fixes with some additional
  * warnings disabled
@@ -28,6 +31,9 @@
  *
  */
 
+#pragma warning(disable:4710)	// function not inlined
+#pragma warning(disable:4711)	// function inlined
+
 #include "udpsocket.h"
 
 #if defined(WIN32)
diff --git a/fs2_open/code/fs2open_pxo/udpsocket.h b/fs2_open/code/fs2open_pxo/udpsocket.h
index 01579885c9..f5d04c5623 100644
--- a/fs2_open/code/fs2open_pxo/udpsocket.h
+++ b/fs2_open/code/fs2open_pxo/udpsocket.h
@@ -10,12 +10,15 @@
 
 /*
  * $Logfile: /Freespace2/code/fs2open_pxo/udpsocket.h $
- * $Revision: 1.3 $
- * $Date: 2004-02-21 00:59:43 $
- * $Author: Kazan $
+ * $Revision: 1.4 $
+ * $Date: 2004-03-31 05:42:26 $
+ * $Author: Goober5000 $
  *
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.3  2004/02/21 00:59:43  Kazan
+ * FS2NETD License Comments
+ *
  * Revision 1.2  2003/10/13 06:02:50  Kazan
  * Added Log Comment Thingy to these files
  *
@@ -29,7 +32,11 @@
 #if defined(WIN32)
 // Windows Version
 #include <windows.h>
+
+#pragma warning(push, 2)	// ignore all those warnings for Microsoft stuff
 #include <string>
+#pragma warning(pop)
+
 //#include <winsock2.h>
 #define STYPE SOCKET
 #define CLOSEFUNC closesocket
diff --git a/fs2_open/code/hud/hudconfig.cpp b/fs2_open/code/hud/hudconfig.cpp
index a843f9b92d..41dacc8f12 100644
--- a/fs2_open/code/hud/hudconfig.cpp
+++ b/fs2_open/code/hud/hudconfig.cpp
@@ -9,13 +9,17 @@
 
 /*
  * $Logfile: /Freespace2/code/Hud/HUDconfig.cpp $
- * $Revision: 2.5 $
- * $Date: 2004-03-05 09:02:03 $
+ * $Revision: 2.6 $
+ * $Date: 2004-03-31 05:42:27 $
  * $Author: Goober5000 $
  *
  * C module to handle HUD configuration
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.5  2004/03/05 09:02:03  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
  * Revision 2.4  2003/03/18 10:07:03  unknownplayer
  * The big DX/main line merge. This has been uploaded to the main CVS since I can't manage to get it to upload to the DX branch. Apologies to all who may be affected adversely, but I'll work to debug it as fast as I can.
  *
@@ -441,7 +445,7 @@ int HC_select_all = 0;
 // Module Globals
 //////////////////////////////////////////////////////////////////////////////
 
-#pragma warning(disable:4710)
+#pragma warning(disable:4710)	// function not inlined
 
 char *Hud_config_fname[GR_NUM_RESOLUTIONS] = {
 	"HUDConfig",
@@ -563,7 +567,7 @@ struct HC_gauge_region	HC_gauge_regions[GR_NUM_RESOLUTIONS][NUM_HUD_GAUGES] =
 	}
 };
 
-#pragma warning(default:4710)
+#pragma warning(default:4710)	// function not inlined
 
 int HC_gauge_description_coords[GR_NUM_RESOLUTIONS][3] = {
 	{	// GR_640
@@ -682,7 +686,7 @@ char *HC_gauge_descriptions(int n)
 #define HCB_RESET					18
 #define HCB_ACCEPT				19
 
-#pragma warning(disable : 4710)
+#pragma warning(disable : 4710)	// function not inlined
 
 ui_button_info HC_buttons[GR_NUM_RESOLUTIONS][NUM_HUD_BUTTONS] = {
 	{ // GR_640
diff --git a/fs2_open/code/io/swff_lib.cpp b/fs2_open/code/io/swff_lib.cpp
index d438a537ba..09d9547372 100644
--- a/fs2_open/code/io/swff_lib.cpp
+++ b/fs2_open/code/io/swff_lib.cpp
@@ -41,7 +41,7 @@ Version	Date		Author	Comments
 #include "directx/vdinput.h"
 #undef INITGUIDS
 
-#pragma warning(disable:4711)
+#pragma warning(disable:4711)	// function selected for inlining
 
 BOOL CALLBACK DIEnumAndDestroyCreatedEffectsProc(LPDIRECTINPUTEFFECT pDIEffect, LPVOID lpvRef);
 BOOL CALLBACK DIEnumDevicesProc(LPCDIDEVICEINSTANCE lpddi, LPVOID lpvContext);
@@ -366,7 +366,7 @@ HRESULT SWFF_DestroyAllEffects(
 }
 
 #pragma warning(push)
-#pragma warning(disable:4100)
+#pragma warning(disable:4100)	// unreferenced formal parameter
 BOOL CALLBACK DIEnumAndDestroyCreatedEffectsProc(LPDIRECTINPUTEFFECT pDIEffect, LPVOID lpvRef)
 {
 	pDIEffect->Release();
diff --git a/fs2_open/code/irc/irc.cpp b/fs2_open/code/irc/irc.cpp
index 0fea50d99f..bbce2fa920 100644
--- a/fs2_open/code/irc/irc.cpp
+++ b/fs2_open/code/irc/irc.cpp
@@ -10,11 +10,14 @@
 
 /*
  * $Logfile: /Freespace2/code/irc/irc.cpp $
- * $Revision: 1.2 $
- * $Date: 2004-03-10 20:51:16 $
- * $Author: Kazan $
+ * $Revision: 1.3 $
+ * $Date: 2004-03-31 05:42:28 $
+ * $Author: Goober5000 $
  * *
  * $Log: not supported by cvs2svn $
+ * Revision 1.2  2004/03/10 20:51:16  Kazan
+ * irc
+ *
  * Revision 1.1  2004/03/10 19:11:40  Kazan
  * generally it helps if i actually add and commit the files i want to modify on a different system
  *
@@ -23,8 +26,9 @@
  */
 
 
-#pragma warning(disable:4786)
-#pragma warning(disable:4710)
+#pragma warning(disable:4786)	// identifier truncated in the debug information
+#pragma warning(disable:4710)	// function not inlined
+#pragma warning(disable:4711)	// function inlined
 #include "irc.h"
 
 
diff --git a/fs2_open/code/irc/irc.h b/fs2_open/code/irc/irc.h
index ed87641ca2..3b72aa72f0 100644
--- a/fs2_open/code/irc/irc.h
+++ b/fs2_open/code/irc/irc.h
@@ -10,11 +10,14 @@
 
 /*
  * $Logfile: /Freespace2/code/irc/irc.h $
- * $Revision: 1.2 $
- * $Date: 2004-03-10 20:51:16 $
- * $Author: Kazan $
+ * $Revision: 1.3 $
+ * $Date: 2004-03-31 05:42:28 $
+ * $Author: Goober5000 $
  * *
  * $Log: not supported by cvs2svn $
+ * Revision 1.2  2004/03/10 20:51:16  Kazan
+ * irc
+ *
  * Revision 1.1  2004/03/10 19:11:40  Kazan
  * generally it helps if i actually add and commit the files i want to modify on a different system
  *
@@ -29,8 +32,11 @@
 
 #include "fs2open_pxo/TCP_Socket.h"
 
+#pragma warning(push, 2)	// ignore all those warnings for Microsoft stuff
 #include <string>
 #include <vector>
+#pragma warning(pop)
+
 #include <fstream.h>
 
 struct irc_user
diff --git a/fs2_open/code/mission/missionhotkey.cpp b/fs2_open/code/mission/missionhotkey.cpp
index b73b4d5dff..7204c86d4d 100644
--- a/fs2_open/code/mission/missionhotkey.cpp
+++ b/fs2_open/code/mission/missionhotkey.cpp
@@ -9,13 +9,17 @@
 
 /*
  * $Logfile: /Freespace2/code/Mission/MissionHotKey.cpp $
- * $Revision: 2.5 $
- * $Date: 2004-03-05 09:02:06 $
+ * $Revision: 2.6 $
+ * $Date: 2004-03-31 05:42:28 $
  * $Author: Goober5000 $
  *
  * C module for the Hotkey selection screen
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.5  2004/03/05 09:02:06  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
  * Revision 2.4  2003/04/05 11:09:21  Goober5000
  * fixed some fiddly bits with scrolling and ui stuff
  * --Goober5000
@@ -358,7 +362,7 @@ static int Hotkey_ship_x[GR_NUM_RESOLUTIONS] = {
 
 // pragma pair put into place because of compiler warnings about being unable to inline
 // the constructor function of the hotkey_buttons set.
-#pragma warning(disable: 4710)
+#pragma warning(disable: 4710)	// function not inlined
 
 struct hotkey_buttons {
 	char *filename;
@@ -400,7 +404,7 @@ static hotkey_buttons Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = {
 	}
 //XSTR:ON
 };
-#pragma warning(default: 4710)
+#pragma warning(default: 4710)	// function not inlined
 
 #define HOTKEY_NUM_TEXT		6
 static UI_XSTR Hotkey_text[GR_NUM_RESOLUTIONS][HOTKEY_NUM_TEXT] = {
diff --git a/fs2_open/code/model/modelread.cpp b/fs2_open/code/model/modelread.cpp
index a1d39283b4..2b403bd705 100644
--- a/fs2_open/code/model/modelread.cpp
+++ b/fs2_open/code/model/modelread.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Model/ModelRead.cpp $
- * $Revision: 2.36 $
- * $Date: 2004-03-21 10:34:05 $
- * $Author: bobboau $
+ * $Revision: 2.37 $
+ * $Date: 2004-03-31 05:42:28 $
+ * $Author: Goober5000 $
  *
  * file which reads and deciphers POF information
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.36  2004/03/21 10:34:05  bobboau
+ * fixed a texture loading bug
+ *
  * Revision 2.35  2004/03/20 21:17:13  bobboau
  * fixed -spec comand line option,
  * probly some other stuf
@@ -3086,7 +3089,7 @@ void model_get_rotating_submodel_axis(vector *model_axis, vector *world_axis, in
 
 // Does stepped rotation of a submodel
 #pragma warning ( push )
-#pragma warning (disable : 4701)
+#pragma warning (disable : 4701)	// possible use of variable without initialization
 void submodel_stepped_rotate(model_subsystem *psub, submodel_instance_info *sii)
 {
 	Assert(psub->flags & MSS_FLAG_STEPPED_ROTATE);
diff --git a/fs2_open/code/network/fs2ox.cpp b/fs2_open/code/network/fs2ox.cpp
index 6328edde8d..ef9be091bf 100644
--- a/fs2_open/code/network/fs2ox.cpp
+++ b/fs2_open/code/network/fs2ox.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile$
- * $Revision: 1.6 $
- * $Date: 2004-03-10 20:51:16 $
- * $Author: Kazan $
+ * $Revision: 1.7 $
+ * $Date: 2004-03-31 05:42:27 $
+ * $Author: Goober5000 $
  *
  * C file for implementing PXO-substitute (FS2OX -- "fs2_open exchange") screen
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.6  2004/03/10 20:51:16  Kazan
+ * irc
+ *
  * Revision 1.5  2004/03/10 18:45:09  Kazan
  * partially complete IRC - so i can work on it on my laptop
  *
@@ -36,8 +39,8 @@
  */
 
 
-#pragma warning(disable:4786)
-#pragma warning(disable:4710)
+#pragma warning(disable:4786)	// identifier truncated in the debug information
+#pragma warning(disable:4710)	// function not inlined
 
 #include "globalincs/pstypes.h"
 #include "ui/ui.h"
diff --git a/fs2_open/code/network/multi.cpp b/fs2_open/code/network/multi.cpp
index 7ded1f1416..87b8c89772 100644
--- a/fs2_open/code/network/multi.cpp
+++ b/fs2_open/code/network/multi.cpp
@@ -9,13 +9,17 @@
 
 /*
  * $Logfile: /Freespace2/code/Network/Multi.cpp $
- * $Revision: 2.17 $
- * $Date: 2004-03-09 17:59:01 $
- * $Author: Kazan $
+ * $Revision: 2.18 $
+ * $Date: 2004-03-31 05:42:27 $
+ * $Author: Goober5000 $
  *
  * C file that contains high-level multiplayer functions
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.17  2004/03/09 17:59:01  Kazan
+ * Disabled multithreaded TCP_Socket in favor of safer single threaded
+ * FS2NetD doesn't kill the game on connection failure now - just gives warning message and effectively dsiables itself until they try to connect again
+ *
  * Revision 2.16  2004/03/09 00:02:16  Kazan
  * more fs2netd stuff
  *
@@ -290,6 +294,9 @@
 
 
 #pragma warning(push)
+// 4018 = signed/unsigned mismatch
+// 4663 = new template specification syntax
+// 4245 = signed/unsigned mismatch in conversion of const value
 #pragma warning(disable: 4663 4018 4663 4245)
 #include "fs2open_pxo/Client.h"
 #if !defined(PXO_TCP)
diff --git a/fs2_open/code/network/multimsgs.cpp b/fs2_open/code/network/multimsgs.cpp
index 8e84ee467a..2b3e4cc14c 100644
--- a/fs2_open/code/network/multimsgs.cpp
+++ b/fs2_open/code/network/multimsgs.cpp
@@ -9,13 +9,20 @@
 
 /*
  * $Logfile: /Freespace2/code/Network/MultiMsgs.cpp $
- * $Revision: 2.16 $
- * $Date: 2004-03-17 04:07:30 $
- * $Author: bobboau $
+ * $Revision: 2.17 $
+ * $Date: 2004-03-31 05:42:27 $
+ * $Author: Goober5000 $
  *
  * C file that holds functions for the building and processing of multiplayer packets
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.16  2004/03/17 04:07:30  bobboau
+ * new fighter beam code
+ * fixed old after burner trails
+ * had to bump a few limits, working on some dynamic solutions
+ * a few fixed to background POF rendering
+ * fixing asorted bugs
+ *
  * Revision 2.15  2004/03/05 09:02:02  Goober5000
  * Uber pass at reducing #includes
  * --Goober5000
@@ -457,6 +464,9 @@
 #include "mission/missionbriefcommon.h"
 
 #pragma warning(push)
+// 4018 = signed/unsigned mismatch
+// 4663 = new template specification syntax
+// 4245 = signed/unsigned mismatch in conversion of const value
 #pragma warning(disable: 4663 4018 4663 4245)
 #include "fs2open_pxo/Client.h"
 #if !defined(PXO_TCP)
diff --git a/fs2_open/code/network/multiutil.cpp b/fs2_open/code/network/multiutil.cpp
index 9175c9bdc2..2b94b7fa83 100644
--- a/fs2_open/code/network/multiutil.cpp
+++ b/fs2_open/code/network/multiutil.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Network/MultiUtil.cpp $
- * $Revision: 2.15 $
- * $Date: 2004-03-05 21:19:39 $
- * $Author: Kazan $
+ * $Revision: 2.16 $
+ * $Date: 2004-03-31 05:42:27 $
+ * $Author: Goober5000 $
  *
  * C file that contains misc. functions to support multiplayer
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.15  2004/03/05 21:19:39  Kazan
+ * Fixed mission validation (was returning false positives)
+ *
  * Revision 2.14  2004/03/05 09:02:02  Goober5000
  * Uber pass at reducing #includes
  * --Goober5000
@@ -303,6 +306,9 @@
 #include "cfile/cfile.h"
 
 #pragma warning(push)
+// 4018 = signed/unsigned mismatch
+// 4663 = new template specification syntax
+// 4245 = signed/unsigned mismatch in conversion of const value
 #pragma warning(disable: 4663 4018 4663 4245)
 #include "fs2open_pxo/Client.h"
 #pragma warning(pop)
diff --git a/fs2_open/code/network/stand_gui.cpp b/fs2_open/code/network/stand_gui.cpp
index c6d28fe0a6..514ba02f91 100644
--- a/fs2_open/code/network/stand_gui.cpp
+++ b/fs2_open/code/network/stand_gui.cpp
@@ -9,11 +9,15 @@
 
 /*
  * $Logfile: /Freespace2/code/Network/stand_gui.cpp $
- * $Revision: 2.9 $
- * $Date: 2004-03-05 09:02:02 $
+ * $Revision: 2.10 $
+ * $Date: 2004-03-31 05:42:27 $
  * $Author: Goober5000 $
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.9  2004/03/05 09:02:02  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
  * Revision 2.8  2004/03/04 05:57:45  Kazan
  * LAN works A1 Supar!
  *
@@ -376,6 +380,9 @@
 #include "cfile/cfile.h"
 
 #pragma warning(push)
+// 4018 = signed/unsigned mismatch
+// 4663 = new template specification syntax
+// 4245 = signed/unsigned mismatch in conversion of const value
 #pragma warning(disable: 4663 4018 4663 4245)
 #include "fs2open_pxo/Client.h"
 #pragma warning(pop)
diff --git a/fs2_open/code/osapi/osapi.cpp b/fs2_open/code/osapi/osapi.cpp
index 84e447c64f..20516349c8 100644
--- a/fs2_open/code/osapi/osapi.cpp
+++ b/fs2_open/code/osapi/osapi.cpp
@@ -9,13 +9,17 @@
 
 /* 
  * $Logfile: /Freespace2/code/OsApi/OsApi.cpp $
- * $Revision: 2.17 $
- * $Date: 2004-03-05 09:02:08 $
+ * $Revision: 2.18 $
+ * $Date: 2004-03-31 05:42:28 $
  * $Author: Goober5000 $
  *
  * Low level Windows code
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.17  2004/03/05 09:02:08  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
  * Revision 2.16  2004/02/16 16:15:04  phreak
  * grr fixed a warning message i didn't see
  *
@@ -347,7 +351,7 @@ void os_resume()
 // OSAPI FORWARD DECLARATIONS
 //
 
-#pragma warning(disable:4702)
+#pragma warning(disable:4702)	// unreachable code
 #ifdef THREADED
 
 // thread handler for the main message thread
@@ -404,7 +408,7 @@ DWORD win32_process2(DWORD lparam)
 	return 0;
 }
 #endif // THREADED
-#pragma warning(default:4702)
+#pragma warning(default:4702)	// unreachable code
 
 // Fills in the Os_debugger_running with non-zero if debugger detected.
 void os_check_debugger()
diff --git a/fs2_open/code/osapi/outwnd.cpp b/fs2_open/code/osapi/outwnd.cpp
index 31b6fa1f13..f72a14fd6e 100644
--- a/fs2_open/code/osapi/outwnd.cpp
+++ b/fs2_open/code/osapi/outwnd.cpp
@@ -9,13 +9,18 @@
 
 /*
  * $Logfile: /Freespace2/code/OsApi/OutWnd.cpp $
- * $Revision: 2.9 $
- * $Date: 2004-03-06 23:28:23 $
- * $Author: bobboau $
+ * $Revision: 2.10 $
+ * $Date: 2004-03-31 05:42:28 $
+ * $Author: Goober5000 $
  *
  * Routines for debugging output
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.9  2004/03/06 23:28:23  bobboau
+ * fixed motion debris
+ * animated laser textures
+ * and added a new error check called a safepoint, mostly for tracking the 'Y bug'
+ *
  * Revision 2.8  2004/03/05 09:02:08  Goober5000
  * Uber pass at reducing #includes
  * --Goober5000
@@ -169,7 +174,7 @@
 #include <string.h>
 
 // to disable otherwise well-lodged compiler warning
-#pragma warning(disable: 4201)
+#pragma warning(disable: 4201)	// nameless struct/union
 
 #include <winioctl.h>
 #include <conio.h>
diff --git a/fs2_open/code/sound/fsspeech.cpp b/fs2_open/code/sound/fsspeech.cpp
index bb334b7166..f25d30caef 100644
--- a/fs2_open/code/sound/fsspeech.cpp
+++ b/fs2_open/code/sound/fsspeech.cpp
@@ -16,7 +16,7 @@
 #include "debugconsole/dbugfile.h"
 #include "sound/fsspeech.h"
 
-#pragma warning(disable:4711)
+#pragma warning(disable:4711)	// function selected for inlining
 
 const int MAX_SPEECH_BUFFER_LEN = 4096;
 
diff --git a/fs2_open/code/species_defs/species_defs.cpp b/fs2_open/code/species_defs/species_defs.cpp
index 184fa57600..7e99cad15c 100644
--- a/fs2_open/code/species_defs/species_defs.cpp
+++ b/fs2_open/code/species_defs/species_defs.cpp
@@ -5,11 +5,15 @@
 
 /*
  * $Logfile: /Freespace2/code/species_defs/species_defs.h $
- * $Revision: 1.7 $
- * $Date: 2004-03-05 09:02:13 $
+ * $Revision: 1.8 $
+ * $Date: 2004-03-31 05:42:29 $
  * $Author: Goober5000 $
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.7  2004/03/05 09:02:13  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
  * Revision 1.6  2004/02/20 04:29:56  bobboau
  * pluged memory leaks,
  * 3D HTL lasers (they work perfictly)
@@ -43,7 +47,7 @@
  */
 
 
-#pragma warning(disable:4710)
+#pragma warning(disable:4710)	// function not inlined
 
 #include "species_defs/species_defs.h"
 #include "mission/missionparse.h"