From 5bf9bca9ef83bbda69ba46b8b515d1a57de7cec6 Mon Sep 17 00:00:00 2001
From: janwas <jan@wildfiregames.com>
Date: Sun, 23 Dec 2007 12:18:57 +0000
Subject: [PATCH] fix/disable warnings.

there are too many W4 and "potentially uninitialized", so those are
disabled by 0ad_warning_disable.h.

the silly "int x = strlen" and very dangerous "int x = (void*)p" (and
vice versa) problems are fixed.

This was SVN commit r5526.
---
 source/dcdt/se/0ad_warning_disable.h    |  6 +++++
 source/dcdt/se/Abstract.cpp             |  1 +
 source/dcdt/se/FunnelDeque.cpp          |  1 +
 source/dcdt/se/Location.cpp             |  1 +
 source/dcdt/se/Search.cpp               |  1 +
 source/dcdt/se/Utility.cpp              |  1 +
 source/dcdt/se/Width.cpp                |  1 +
 source/dcdt/se/se.cpp                   |  1 +
 source/dcdt/se/se_dcdt.cpp              |  1 +
 source/dcdt/se/se_dcdt_mesh.cpp         |  1 +
 source/dcdt/se/se_mesh.cpp              |  1 +
 source/dcdt/se/se_mesh_import.cpp       |  1 +
 source/dcdt/se/se_mesh_io.cpp           | 19 ++++++++------
 source/dcdt/se/se_mesh_operators.cpp    |  1 +
 source/dcdt/se/se_triangulator.cpp      |  1 +
 source/dcdt/se/sr.cpp                   |  1 +
 source/dcdt/se/sr_alg.cpp               |  1 +
 source/dcdt/se/sr_array.cpp             |  1 +
 source/dcdt/se/sr_array_pt.cpp          |  3 ++-
 source/dcdt/se/sr_box.cpp               |  1 +
 source/dcdt/se/sr_buffer.cpp            |  1 +
 source/dcdt/se/sr_bv.cpp                |  1 +
 source/dcdt/se/sr_bv_coldet.cpp         |  1 +
 source/dcdt/se/sr_bv_math.cpp           |  3 +++
 source/dcdt/se/sr_bv_nbody.cpp          |  1 +
 source/dcdt/se/sr_bv_tree.cpp           |  1 +
 source/dcdt/se/sr_bv_tree_query.cpp     |  1 +
 source/dcdt/se/sr_camera.cpp            |  1 +
 source/dcdt/se/sr_cfg_manager.cpp       |  1 +
 source/dcdt/se/sr_cfg_path.cpp          |  3 +++
 source/dcdt/se/sr_cfg_planner.cpp       |  1 +
 source/dcdt/se/sr_cfg_planner_lazy.cpp  |  1 +
 source/dcdt/se/sr_cfg_tree.cpp          |  1 +
 source/dcdt/se/sr_color.cpp             |  1 +
 source/dcdt/se/sr_cylinder.cpp          |  1 +
 source/dcdt/se/sr_euler.cpp             |  1 +
 source/dcdt/se/sr_event.cpp             |  1 +
 source/dcdt/se/sr_exp_table.cpp         |  6 +++--
 source/dcdt/se/sr_geo2.cpp              |  1 +
 source/dcdt/se/sr_graph.cpp             |  1 +
 source/dcdt/se/sr_grid.cpp              |  1 +
 source/dcdt/se/sr_hash_table.cpp        |  1 +
 source/dcdt/se/sr_image.cpp             |  1 +
 source/dcdt/se/sr_input.cpp             |  7 ++---
 source/dcdt/se/sr_light.cpp             |  1 +
 source/dcdt/se/sr_line.cpp              |  1 +
 source/dcdt/se/sr_lines.cpp             |  1 +
 source/dcdt/se/sr_list.cpp              |  1 +
 source/dcdt/se/sr_list_node.cpp         |  1 +
 source/dcdt/se/sr_mat.cpp               |  1 +
 source/dcdt/se/sr_material.cpp          |  1 +
 source/dcdt/se/sr_matn.cpp              |  1 +
 source/dcdt/se/sr_mem_control.cpp       |  7 ++---
 source/dcdt/se/sr_model.cpp             |  1 +
 source/dcdt/se/sr_model_export_iv.cpp   |  1 +
 source/dcdt/se/sr_model_import_obj.cpp  |  1 +
 source/dcdt/se/sr_output.cpp            |  1 +
 source/dcdt/se/sr_path_array.cpp        |  1 +
 source/dcdt/se/sr_plane.cpp             |  1 +
 source/dcdt/se/sr_points.cpp            |  1 +
 source/dcdt/se/sr_polygon.cpp           |  1 +
 source/dcdt/se/sr_polygons.cpp          |  1 +
 source/dcdt/se/sr_quat.cpp              |  1 +
 source/dcdt/se/sr_random.cpp            |  1 +
 source/dcdt/se/sr_sa.cpp                |  1 +
 source/dcdt/se/sr_sa_bbox.cpp           |  1 +
 source/dcdt/se/sr_sa_eps_export.cpp     |  1 +
 source/dcdt/se/sr_sa_event.cpp          |  1 +
 source/dcdt/se/sr_sa_model_export.cpp   |  1 +
 source/dcdt/se/sr_sa_render_mode.cpp    |  1 +
 source/dcdt/se/sr_set.cpp               |  1 +
 source/dcdt/se/sr_sn.cpp                |  1 +
 source/dcdt/se/sr_sn_editor.cpp         |  1 +
 source/dcdt/se/sr_sn_group.cpp          |  1 +
 source/dcdt/se/sr_sn_manipulator.cpp    |  1 +
 source/dcdt/se/sr_sn_matrix.cpp         |  1 +
 source/dcdt/se/sr_sn_polygon_editor.cpp |  1 +
 source/dcdt/se/sr_sn_shape.cpp          |  1 +
 source/dcdt/se/sr_sphere.cpp            |  1 +
 source/dcdt/se/sr_spline.cpp            |  1 +
 source/dcdt/se/sr_string.cpp            | 35 +++++++++++++------------
 source/dcdt/se/sr_string_array.cpp      |  1 +
 source/dcdt/se/sr_time.cpp              |  1 +
 source/dcdt/se/sr_trackball.cpp         |  1 +
 source/dcdt/se/sr_tree.cpp              |  1 +
 source/dcdt/se/sr_triangle.cpp          |  1 +
 source/dcdt/se/sr_triangulation.cpp     |  1 +
 source/dcdt/se/sr_var.cpp               |  3 ++-
 source/dcdt/se/sr_var_table.cpp         |  1 +
 source/dcdt/se/sr_vec.cpp               |  1 +
 source/dcdt/se/sr_vec2.cpp              |  1 +
 91 files changed, 138 insertions(+), 35 deletions(-)
 create mode 100644 source/dcdt/se/0ad_warning_disable.h

diff --git a/source/dcdt/se/0ad_warning_disable.h b/source/dcdt/se/0ad_warning_disable.h
new file mode 100644
index 0000000000..1685f1c00c
--- /dev/null
+++ b/source/dcdt/se/0ad_warning_disable.h
@@ -0,0 +1,6 @@
+#pragma warning(push, 3)
+
+// it's way too much work to check all of these (runtime invariants may
+// ensure the code is safe but cannot automatically be proved by the
+// compiler)
+#pragma warning(disable:4701)	// "potentially uninitialized variable"
diff --git a/source/dcdt/se/Abstract.cpp b/source/dcdt/se/Abstract.cpp
index 953e92720a..d5d665d7cc 100644
--- a/source/dcdt/se/Abstract.cpp
+++ b/source/dcdt/se/Abstract.cpp
@@ -2,6 +2,7 @@
 
 //DJD: Abstract function definitions {
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 #include <math.h>
 #include <fstream>
diff --git a/source/dcdt/se/FunnelDeque.cpp b/source/dcdt/se/FunnelDeque.cpp
index fbc3024e9b..17432ac9a9 100644
--- a/source/dcdt/se/FunnelDeque.cpp
+++ b/source/dcdt/se/FunnelDeque.cpp
@@ -3,6 +3,7 @@
 //DJD: definition of FunnelNode functions {
 
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 #include "FunnelDeque.h"
 #include <float.h>
diff --git a/source/dcdt/se/Location.cpp b/source/dcdt/se/Location.cpp
index d33900248c..02202d59d8 100644
--- a/source/dcdt/se/Location.cpp
+++ b/source/dcdt/se/Location.cpp
@@ -1,6 +1,7 @@
 //Location.cpp
 
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 #include <cstdlib>
 #include <math.h>
diff --git a/source/dcdt/se/Search.cpp b/source/dcdt/se/Search.cpp
index c8bab7471f..b8f1054047 100644
--- a/source/dcdt/se/Search.cpp
+++ b/source/dcdt/se/Search.cpp
@@ -2,6 +2,7 @@
 
 //DJD: Abstract space searching function definitions {
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 #include "se_dcdt.h"
 
diff --git a/source/dcdt/se/Utility.cpp b/source/dcdt/se/Utility.cpp
index ea75704003..73c170cdca 100644
--- a/source/dcdt/se/Utility.cpp
+++ b/source/dcdt/se/Utility.cpp
@@ -3,6 +3,7 @@
 //DJD: Helper function definitions {
 
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 #include <math.h>
 
diff --git a/source/dcdt/se/Width.cpp b/source/dcdt/se/Width.cpp
index c348cf3d63..95eac72bd4 100644
--- a/source/dcdt/se/Width.cpp
+++ b/source/dcdt/se/Width.cpp
@@ -2,6 +2,7 @@
 
 //DJD: Width function definitions {
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 #include "se_dcdt.h"
 #include <math.h>
diff --git a/source/dcdt/se/se.cpp b/source/dcdt/se/se.cpp
index 12e445d58d..ec0786f172 100644
--- a/source/dcdt/se/se.cpp
+++ b/source/dcdt/se/se.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 # include "se.h"
 
diff --git a/source/dcdt/se/se_dcdt.cpp b/source/dcdt/se/se_dcdt.cpp
index 2ab3d02bc1..800dddd8a0 100644
--- a/source/dcdt/se/se_dcdt.cpp
+++ b/source/dcdt/se/se_dcdt.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 # include <math.h>
 # include <stdlib.h>
diff --git a/source/dcdt/se/se_dcdt_mesh.cpp b/source/dcdt/se/se_dcdt_mesh.cpp
index e373ca7847..cc8da75585 100644
--- a/source/dcdt/se/se_dcdt_mesh.cpp
+++ b/source/dcdt/se/se_dcdt_mesh.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 # include "se_dcdt.h"
 
diff --git a/source/dcdt/se/se_mesh.cpp b/source/dcdt/se/se_mesh.cpp
index b3ddf1fc59..fd804197dc 100644
--- a/source/dcdt/se/se_mesh.cpp
+++ b/source/dcdt/se/se_mesh.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 # include "sr_array.h"
 
diff --git a/source/dcdt/se/se_mesh_import.cpp b/source/dcdt/se/se_mesh_import.cpp
index e86f6a41c3..51ac372ee5 100644
--- a/source/dcdt/se/se_mesh_import.cpp
+++ b/source/dcdt/se/se_mesh_import.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 # include "sr_tree.h"
 # include "se_mesh_import.h"
diff --git a/source/dcdt/se/se_mesh_io.cpp b/source/dcdt/se/se_mesh_io.cpp
index 96775a9243..c718fb9321 100644
--- a/source/dcdt/se/se_mesh_io.cpp
+++ b/source/dcdt/se/se_mesh_io.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 # include <string.h>
 # include "se_mesh.h"
@@ -8,7 +9,7 @@
 
 //================================ IO =========================================
 
-# define ID(se) int(se->_edge)
+# define ID(se) intptr_t(se->_edge)
 
 void SeMeshBase::_elemsave ( SrOutput& out, SeMeshBase::ElemType type, SeElement* first )
  {
@@ -44,7 +45,8 @@ bool SeMeshBase::save ( SrOutput& out )
  {
    SeBase *se;
    SeElement *el, *eli;
-   int symedges, i, j;
+   int symedges, j;
+   intptr_t i;
 
    out << "SYMEDGE MESH DESCRIPTION\n\n";
    //fprintf ( f, "SYMEDGE MESH DESCRIPTION\n\n" );
@@ -159,7 +161,8 @@ void SeMeshBase::_elemload ( SrInput& inp, SrArray<SeElement*>& E,
 bool SeMeshBase::load ( SrInput& inp )
  {
    //char buf[64];
-   int i, x;
+   int i;
+   intptr_t x;
 
    //fscanf ( f, "%s", buf ); if ( strcmp(buf,"SYMEDGE") ) return false;
    //fscanf ( f, "%s", buf ); if ( strcmp(buf,"MESH") ) return false;
@@ -197,11 +200,11 @@ bool SeMeshBase::load ( SrInput& inp )
 
    // convert indices to pointers:
    for ( i=0; i<S.size(); i++ )
-    { S[i]->_next   = S[(int)(S[i]->_next)];
-      S[i]->_rotate = S[(int)(S[i]->_rotate)];
-      S[i]->_vertex = V[(int)(S[i]->_vertex)];
-      S[i]->_edge   = E[(int)(S[i]->_edge)];
-      S[i]->_face   = F[(int)(S[i]->_face)];
+    { S[i]->_next   = S[(intptr_t)(S[i]->_next)];
+      S[i]->_rotate = S[(intptr_t)(S[i]->_rotate)];
+      S[i]->_vertex = V[(intptr_t)(S[i]->_vertex)];
+      S[i]->_edge   = E[(intptr_t)(S[i]->_edge)];
+      S[i]->_face   = F[(intptr_t)(S[i]->_face)];
     }
 
    // adjust internal variables:
diff --git a/source/dcdt/se/se_mesh_operators.cpp b/source/dcdt/se/se_mesh_operators.cpp
index 93d934537a..0ea30330c0 100644
--- a/source/dcdt/se/se_mesh_operators.cpp
+++ b/source/dcdt/se/se_mesh_operators.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 # include <stdlib.h>
 # include "se_mesh.h"
diff --git a/source/dcdt/se/se_triangulator.cpp b/source/dcdt/se/se_triangulator.cpp
index c5f4ebc2d1..b8ff08008f 100644
--- a/source/dcdt/se/se_triangulator.cpp
+++ b/source/dcdt/se/se_triangulator.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 # include <math.h>
 # include <stdlib.h>
diff --git a/source/dcdt/se/sr.cpp b/source/dcdt/se/sr.cpp
index ecb5d1a7a6..f279767bea 100644
--- a/source/dcdt/se/sr.cpp
+++ b/source/dcdt/se/sr.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <stdio.h>
 # include <string.h>
 
diff --git a/source/dcdt/se/sr_alg.cpp b/source/dcdt/se/sr_alg.cpp
index af48522520..903825beb5 100644
--- a/source/dcdt/se/sr_alg.cpp
+++ b/source/dcdt/se/sr_alg.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <math.h>
 
 # include "sr.h"
diff --git a/source/dcdt/se/sr_array.cpp b/source/dcdt/se/sr_array.cpp
index 6f96fd339d..ac307b9c6e 100644
--- a/source/dcdt/se/sr_array.cpp
+++ b/source/dcdt/se/sr_array.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h" 
+#include "0ad_warning_disable.h"
 # include <stdlib.h>
 # include <string.h>
 
diff --git a/source/dcdt/se/sr_array_pt.cpp b/source/dcdt/se/sr_array_pt.cpp
index 2d9041e86c..c7f47d17b7 100644
--- a/source/dcdt/se/sr_array_pt.cpp
+++ b/source/dcdt/se/sr_array_pt.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_array_pt.h"
 
 //====================== SrArrayPtBase ==========================
@@ -134,7 +135,7 @@ static SrClassManagerBase* StaticManager = 0; // This is not thread safe...
 
 static int fcmp ( const void* pt1, const void* pt2 )
  {
-   typedef const int* cint;
+   typedef const intptr_t* cint;
    return StaticManager->compare( (const void*)*cint(pt1), (const void*)*cint(pt2) );
  }
 
diff --git a/source/dcdt/se/sr_box.cpp b/source/dcdt/se/sr_box.cpp
index 7be61f199c..0da01f730f 100644
--- a/source/dcdt/se/sr_box.cpp
+++ b/source/dcdt/se/sr_box.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 # include "sr_box.h"
 # include "sr_mat.h"
diff --git a/source/dcdt/se/sr_buffer.cpp b/source/dcdt/se/sr_buffer.cpp
index 43f19311e1..2af19f8024 100644
--- a/source/dcdt/se/sr_buffer.cpp
+++ b/source/dcdt/se/sr_buffer.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <stdlib.h>
 # include <string.h>
 
diff --git a/source/dcdt/se/sr_bv.cpp b/source/dcdt/se/sr_bv.cpp
index 8af8c94293..5234c3119f 100644
--- a/source/dcdt/se/sr_bv.cpp
+++ b/source/dcdt/se/sr_bv.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 /* Note: this code was adapted from the PQP library; 
    their copyright notice can be found at the end of this file. */
 
diff --git a/source/dcdt/se/sr_bv_coldet.cpp b/source/dcdt/se/sr_bv_coldet.cpp
index 9710f34974..68b5e10aab 100644
--- a/source/dcdt/se/sr_bv_coldet.cpp
+++ b/source/dcdt/se/sr_bv_coldet.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_bv_coldet.h"
 
 //============================= SrBvColdet::Object ===========================
diff --git a/source/dcdt/se/sr_bv_math.cpp b/source/dcdt/se/sr_bv_math.cpp
index a6891fa1d9..5958d47842 100644
--- a/source/dcdt/se/sr_bv_math.cpp
+++ b/source/dcdt/se/sr_bv_math.cpp
@@ -1,5 +1,6 @@
 #include "precompiled.h"/* Note: this code was adapted from the PQP library; 
    their copyright notice can be found at the end of this file. */
+#include "0ad_warning_disable.h"
 
 # include <math.h>
 # include <stdio.h>
@@ -512,8 +513,10 @@ void SrBvMath::Meigen ( srbvmat vout, srbvvec dout, srbvmat a )
 
 #ifdef _WIN32
 #include <float.h>
+#ifndef isnan
 #define isnan _isnan
 #endif
+#endif
 
 //--------------------------------------------------------------------------
 // SegPoints() 
diff --git a/source/dcdt/se/sr_bv_nbody.cpp b/source/dcdt/se/sr_bv_nbody.cpp
index 5795a3526f..4edffc49c0 100644
--- a/source/dcdt/se/sr_bv_nbody.cpp
+++ b/source/dcdt/se/sr_bv_nbody.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <math.h>
 # include "sr_bv_nbody.h"
 # include "sr_model.h"
diff --git a/source/dcdt/se/sr_bv_tree.cpp b/source/dcdt/se/sr_bv_tree.cpp
index e8cf4f0c01..5ab02006c7 100644
--- a/source/dcdt/se/sr_bv_tree.cpp
+++ b/source/dcdt/se/sr_bv_tree.cpp
@@ -1,5 +1,6 @@
 #include "precompiled.h"/* Note: this code was adapted from the PQP library; 
    their copyright notice can be found at the end of this file. */
+#include "0ad_warning_disable.h"
 
 # include "sr_bv_tree.h"
 # include "sr_model.h"
diff --git a/source/dcdt/se/sr_bv_tree_query.cpp b/source/dcdt/se/sr_bv_tree_query.cpp
index 7306135d76..2ed2035951 100644
--- a/source/dcdt/se/sr_bv_tree_query.cpp
+++ b/source/dcdt/se/sr_bv_tree_query.cpp
@@ -1,5 +1,6 @@
 #include "precompiled.h"/* Note: this code was adapted from the PQP library; 
    their copyright notice can be found at the end of this file. */
+#include "0ad_warning_disable.h"
 
 # include "sr_bv_tree_query.h"
 
diff --git a/source/dcdt/se/sr_camera.cpp b/source/dcdt/se/sr_camera.cpp
index f22cfc3da9..7ef5c70bd6 100644
--- a/source/dcdt/se/sr_camera.cpp
+++ b/source/dcdt/se/sr_camera.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h" 
+#include "0ad_warning_disable.h"
 # include <math.h>
 # include "sr_box.h"
 # include "sr_plane.h"
diff --git a/source/dcdt/se/sr_cfg_manager.cpp b/source/dcdt/se/sr_cfg_manager.cpp
index 3fbfa9cc5c..4fd465330d 100644
--- a/source/dcdt/se/sr_cfg_manager.cpp
+++ b/source/dcdt/se/sr_cfg_manager.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_cfg_manager.h"
 
 //=========================== SrCfgManagerBase ========================================
diff --git a/source/dcdt/se/sr_cfg_path.cpp b/source/dcdt/se/sr_cfg_path.cpp
index f4b67be3e8..06a6706a0c 100644
--- a/source/dcdt/se/sr_cfg_path.cpp
+++ b/source/dcdt/se/sr_cfg_path.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_cfg_path.h"
 # include "sr_random.h"
 
@@ -381,6 +382,7 @@ bool SrCfgPathBase::smooth_step ()
  {
    smooth_random ( _sprec, _slen );
 return false;
+#if 0
    int i, imax=1;
    int lasti = size()-2;
    float d;
@@ -425,6 +427,7 @@ return false;
     
    if ( _sbads>6 ) return true; // no more easy improvements
    return false;
+#endif
  }
 
 SrOutput& operator<< ( SrOutput& o, const SrCfgPathBase& p )
diff --git a/source/dcdt/se/sr_cfg_planner.cpp b/source/dcdt/se/sr_cfg_planner.cpp
index 01bcaa4553..ec16b2504d 100644
--- a/source/dcdt/se/sr_cfg_planner.cpp
+++ b/source/dcdt/se/sr_cfg_planner.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_cfg_planner.h"
 
 //# define SR_USE_TRACE1    // start
diff --git a/source/dcdt/se/sr_cfg_planner_lazy.cpp b/source/dcdt/se/sr_cfg_planner_lazy.cpp
index a6a988678b..abafd651a2 100644
--- a/source/dcdt/se/sr_cfg_planner_lazy.cpp
+++ b/source/dcdt/se/sr_cfg_planner_lazy.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_cfg_planner.h"
 
 //# define SR_USE_TRACE1    // not used
diff --git a/source/dcdt/se/sr_cfg_tree.cpp b/source/dcdt/se/sr_cfg_tree.cpp
index 6552c8fd82..2d64d532a0 100644
--- a/source/dcdt/se/sr_cfg_tree.cpp
+++ b/source/dcdt/se/sr_cfg_tree.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_cfg_tree.h"
 
 //# define SR_USE_TRACE1    // expand node
diff --git a/source/dcdt/se/sr_color.cpp b/source/dcdt/se/sr_color.cpp
index 54cb53f6ae..80653872ce 100644
--- a/source/dcdt/se/sr_color.cpp
+++ b/source/dcdt/se/sr_color.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h" 
+#include "0ad_warning_disable.h"
 # include "sr_color.h"
 
 //========================================= static =======================================
diff --git a/source/dcdt/se/sr_cylinder.cpp b/source/dcdt/se/sr_cylinder.cpp
index 5d721ec2e7..722a6b093b 100644
--- a/source/dcdt/se/sr_cylinder.cpp
+++ b/source/dcdt/se/sr_cylinder.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_cylinder.h"
 # include "sr_box.h"
 
diff --git a/source/dcdt/se/sr_euler.cpp b/source/dcdt/se/sr_euler.cpp
index af79ee5237..5dc2975b0a 100644
--- a/source/dcdt/se/sr_euler.cpp
+++ b/source/dcdt/se/sr_euler.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_euler.h"
 # include "sr_mat.h"
 # include <math.h>
diff --git a/source/dcdt/se/sr_event.cpp b/source/dcdt/se/sr_event.cpp
index 43965fd186..0d5ce2228a 100644
--- a/source/dcdt/se/sr_event.cpp
+++ b/source/dcdt/se/sr_event.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h" 
+#include "0ad_warning_disable.h"
 # include "sr_event.h"
 
 //# define SR_USE_TRACE1  
diff --git a/source/dcdt/se/sr_exp_table.cpp b/source/dcdt/se/sr_exp_table.cpp
index 5e43081f47..47fcc05a2c 100644
--- a/source/dcdt/se/sr_exp_table.cpp
+++ b/source/dcdt/se/sr_exp_table.cpp
@@ -1,4 +1,6 @@
-#include "precompiled.h"//***************************************************************************
+#include "precompiled.h"
+#include "0ad_warning_disable.h"
+//***************************************************************************
 //
 //  SrExpTABLE.H
 //  By Marcelo Kallmann 08/98 - Brazil
@@ -60,7 +62,7 @@ static srFunc func_code ( const char *st )
                             compfunc                 // compare function
                           );
    if (!result) return srFuncUndefined;
-   return (srFunc) ( ((int)result-(int)Functions)/sizeof(int) );
+   return (srFunc) ( ((intptr_t)result-(intptr_t)Functions)/sizeof(int) );
  }
 
 const char *SrExpTable::function_name ( int index )
diff --git a/source/dcdt/se/sr_geo2.cpp b/source/dcdt/se/sr_geo2.cpp
index 8399650a85..76c4e34cce 100644
--- a/source/dcdt/se/sr_geo2.cpp
+++ b/source/dcdt/se/sr_geo2.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <stdio.h>
 # include <math.h>
 
diff --git a/source/dcdt/se/sr_graph.cpp b/source/dcdt/se/sr_graph.cpp
index 1a4cee7856..ce1acc47a2 100644
--- a/source/dcdt/se/sr_graph.cpp
+++ b/source/dcdt/se/sr_graph.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <stdlib.h>
 # include "sr_graph.h"
 # include "sr_heap.h"
diff --git a/source/dcdt/se/sr_grid.cpp b/source/dcdt/se/sr_grid.cpp
index d0675be62a..337a6e4077 100644
--- a/source/dcdt/se/sr_grid.cpp
+++ b/source/dcdt/se/sr_grid.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_grid.h"
 
 //============================ SrGridBase =================================
diff --git a/source/dcdt/se/sr_hash_table.cpp b/source/dcdt/se/sr_hash_table.cpp
index b6e350af60..9cf652b1b6 100644
--- a/source/dcdt/se/sr_hash_table.cpp
+++ b/source/dcdt/se/sr_hash_table.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_hash_table.h"
 
 //================================ hash function =============================
diff --git a/source/dcdt/se/sr_image.cpp b/source/dcdt/se/sr_image.cpp
index 723d4cef26..3040207022 100644
--- a/source/dcdt/se/sr_image.cpp
+++ b/source/dcdt/se/sr_image.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <string.h>
 
 # include "sr_image.h"
diff --git a/source/dcdt/se/sr_input.cpp b/source/dcdt/se/sr_input.cpp
index a736d41a8d..6df64b76e1 100644
--- a/source/dcdt/se/sr_input.cpp
+++ b/source/dcdt/se/sr_input.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <stdlib.h>
 # include <string.h>
 # include <ctype.h>
@@ -58,7 +59,7 @@ SrInput::SrInput ( const char *buff, char com )
    if ( buff )
     { _cur.s = buff;
       _ini.s = buff;
-      _size = strlen ( buff );
+      _size = (int)strlen ( buff );
       _curline = 1;
       _type = (srbyte) TypeString;
     }
@@ -112,7 +113,7 @@ void SrInput::init ( const char *buff )
    if ( buff )
     { _cur.s = buff;
       _ini.s = buff;
-      _size = strlen ( buff );
+      _size = (int)strlen ( buff );
       _curline = 1;
       _type = (srbyte) TypeString;
     }
@@ -284,7 +285,7 @@ void SrInput::rewind ()
 int SrInput::pos ()
  {
    if ( ISFILE ) return ((int)ftell(_cur.f)) - _ini.f;
-    else if ( ISSTRING ) return ((sruint)_cur.s) - ((sruint)_ini.s);
+    else if ( ISSTRING ) return _cur.s - _ini.s;
      else return 0;
  }
 
diff --git a/source/dcdt/se/sr_light.cpp b/source/dcdt/se/sr_light.cpp
index 1d64914b89..d2d31c5dc9 100644
--- a/source/dcdt/se/sr_light.cpp
+++ b/source/dcdt/se/sr_light.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_light.h"
 
 //===================================== SrLight ================================
diff --git a/source/dcdt/se/sr_line.cpp b/source/dcdt/se/sr_line.cpp
index 6ad32cfc23..451fc50ae6 100644
--- a/source/dcdt/se/sr_line.cpp
+++ b/source/dcdt/se/sr_line.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <math.h>
 # include "sr_box.h"
 # include "sr_line.h"
diff --git a/source/dcdt/se/sr_lines.cpp b/source/dcdt/se/sr_lines.cpp
index fe9d6f9164..d9802edd34 100644
--- a/source/dcdt/se/sr_lines.cpp
+++ b/source/dcdt/se/sr_lines.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_box.h"
 # include "sr_mat.h"
 # include "sr_vec2.h"
diff --git a/source/dcdt/se/sr_list.cpp b/source/dcdt/se/sr_list.cpp
index 747283ebce..b62dd0e4ab 100644
--- a/source/dcdt/se/sr_list.cpp
+++ b/source/dcdt/se/sr_list.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_list.h"
 
 //============================ SrListBase =================================
diff --git a/source/dcdt/se/sr_list_node.cpp b/source/dcdt/se/sr_list_node.cpp
index 24a5c19e50..efd415e35a 100644
--- a/source/dcdt/se/sr_list_node.cpp
+++ b/source/dcdt/se/sr_list_node.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_list_node.h"
 
 //=============================== SrListNode ================================
diff --git a/source/dcdt/se/sr_mat.cpp b/source/dcdt/se/sr_mat.cpp
index a2fd8d1190..6a09fe1d63 100644
--- a/source/dcdt/se/sr_mat.cpp
+++ b/source/dcdt/se/sr_mat.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <math.h>
 
 # include "sr_mat.h"
diff --git a/source/dcdt/se/sr_material.cpp b/source/dcdt/se/sr_material.cpp
index b79708a0cd..bd2e376a52 100644
--- a/source/dcdt/se/sr_material.cpp
+++ b/source/dcdt/se/sr_material.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_material.h"
 
 //# define SR_USE_TRACE1 
diff --git a/source/dcdt/se/sr_matn.cpp b/source/dcdt/se/sr_matn.cpp
index 60e0f8440e..ed8cc59485 100644
--- a/source/dcdt/se/sr_matn.cpp
+++ b/source/dcdt/se/sr_matn.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <string.h>
 # include <math.h>
 
diff --git a/source/dcdt/se/sr_mem_control.cpp b/source/dcdt/se/sr_mem_control.cpp
index d2b9baf62b..6a4e55f768 100644
--- a/source/dcdt/se/sr_mem_control.cpp
+++ b/source/dcdt/se/sr_mem_control.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <stdlib.h>
 # include <string.h>
 # include <ctype.h>
@@ -54,7 +55,7 @@ void *sr_mem_control_alloc ( const char* type, char* file, int line, int size, v
    if ( !addr ) 
     { //lineout ();
       output<<"\nsr_control_malloc: Zero Pointer Allocated!\n" << 
-              "File:"<<file<<" Line:"<<line<<" Elem Size:"<<size<<" Address:"<<(int)addr<<'\n';
+              "File:"<<file<<" Line:"<<line<<" Elem Size:"<<size<<" Address:"<<(intptr_t)addr<<'\n';
       //lineout ();
     }
 
@@ -64,7 +65,7 @@ void *sr_mem_control_alloc ( const char* type, char* file, int line, int size, v
     }
 
    // the following is to get rid of the full path of files (in visualc++):
-   int i = strlen(file);
+   int i = (int)strlen(file);
    file += (i-1);
    while ( i>0 && *file!='\\' && *file!='/' ) { file--; i--; }
    if ( i>0 ) file++;
@@ -110,7 +111,7 @@ void sr_memory_report ()
 
    for ( int i=0; i<mem_data_size; i++ )
     { srMemData &m = mem_data[i];
-      output.putf ( "%3d: %-25s %-15s %-6d %-8d %d\n", i+1, m.file, m.type, m.line, m.size, (int)m.addr );
+      output.putf ( "%3d: %-25s %-15s %-6d %-8d %d\n", i+1, m.file, m.type, m.line, m.size, (intptr_t)m.addr );
     }
 
    output << srnl;
diff --git a/source/dcdt/se/sr_model.cpp b/source/dcdt/se/sr_model.cpp
index 24d9f6396d..0119382513 100644
--- a/source/dcdt/se/sr_model.cpp
+++ b/source/dcdt/se/sr_model.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <stdlib.h>
 
 # include "sr_model.h"
diff --git a/source/dcdt/se/sr_model_export_iv.cpp b/source/dcdt/se/sr_model_export_iv.cpp
index c5fb04be71..eda3bcbbcb 100644
--- a/source/dcdt/se/sr_model_export_iv.cpp
+++ b/source/dcdt/se/sr_model_export_iv.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_model.h"
 
 //# define SR_USE_TRACE1    // keyword tracking
diff --git a/source/dcdt/se/sr_model_import_obj.cpp b/source/dcdt/se/sr_model_import_obj.cpp
index d31c730bc5..d948138657 100644
--- a/source/dcdt/se/sr_model_import_obj.cpp
+++ b/source/dcdt/se/sr_model_import_obj.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_string_array.h"
 # include "sr_model.h"
 
diff --git a/source/dcdt/se/sr_output.cpp b/source/dcdt/se/sr_output.cpp
index 914e5efc7d..1df7d7418c 100644
--- a/source/dcdt/se/sr_output.cpp
+++ b/source/dcdt/se/sr_output.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <stdarg.h> 
 # include <stdlib.h> 
 # include <stdio.h>
diff --git a/source/dcdt/se/sr_path_array.cpp b/source/dcdt/se/sr_path_array.cpp
index 28e1bc224b..a37b4859d1 100644
--- a/source/dcdt/se/sr_path_array.cpp
+++ b/source/dcdt/se/sr_path_array.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_path_array.h"
 
 //# define SR_USE_TRACE1
diff --git a/source/dcdt/se/sr_plane.cpp b/source/dcdt/se/sr_plane.cpp
index 42cec1794b..98a6aa24b4 100644
--- a/source/dcdt/se/sr_plane.cpp
+++ b/source/dcdt/se/sr_plane.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_plane.h"
 
 //============================== SrPlane ======================================
diff --git a/source/dcdt/se/sr_points.cpp b/source/dcdt/se/sr_points.cpp
index b47cd98330..3f6cb19a60 100644
--- a/source/dcdt/se/sr_points.cpp
+++ b/source/dcdt/se/sr_points.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_box.h"
 # include "sr_vec2.h"
 # include "sr_points.h"
diff --git a/source/dcdt/se/sr_polygon.cpp b/source/dcdt/se/sr_polygon.cpp
index 98bc90c2d9..c7b76ab640 100644
--- a/source/dcdt/se/sr_polygon.cpp
+++ b/source/dcdt/se/sr_polygon.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h" 
+#include "0ad_warning_disable.h"
 # include <math.h>
 # include "sr_box.h"
 # include "sr_geo2.h"
diff --git a/source/dcdt/se/sr_polygons.cpp b/source/dcdt/se/sr_polygons.cpp
index cbb9771edc..cc2caf1e59 100644
--- a/source/dcdt/se/sr_polygons.cpp
+++ b/source/dcdt/se/sr_polygons.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_box.h"
 # include "sr_polygons.h"
 
diff --git a/source/dcdt/se/sr_quat.cpp b/source/dcdt/se/sr_quat.cpp
index 1c4bbe2a7d..7be7f9a676 100644
--- a/source/dcdt/se/sr_quat.cpp
+++ b/source/dcdt/se/sr_quat.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 
 # include "sr_quat.h"
 # include "sr_vec.h"
diff --git a/source/dcdt/se/sr_random.cpp b/source/dcdt/se/sr_random.cpp
index 649a67a946..41772277b6 100644
--- a/source/dcdt/se/sr_random.cpp
+++ b/source/dcdt/se/sr_random.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr.h"
 # include "sr_random.h"
 
diff --git a/source/dcdt/se/sr_sa.cpp b/source/dcdt/se/sr_sa.cpp
index e1cf5b9d44..7d3ed42c6c 100644
--- a/source/dcdt/se/sr_sa.cpp
+++ b/source/dcdt/se/sr_sa.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 //# include <stdlib.h>
 
 # include "sr_sa.h"
diff --git a/source/dcdt/se/sr_sa_bbox.cpp b/source/dcdt/se/sr_sa_bbox.cpp
index e6236e5f30..511d67990c 100644
--- a/source/dcdt/se/sr_sa_bbox.cpp
+++ b/source/dcdt/se/sr_sa_bbox.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 //# include <stdlib.h>
 
 # include "sr_sa_bbox.h"
diff --git a/source/dcdt/se/sr_sa_eps_export.cpp b/source/dcdt/se/sr_sa_eps_export.cpp
index 9f69313360..5060cf8777 100644
--- a/source/dcdt/se/sr_sa_eps_export.cpp
+++ b/source/dcdt/se/sr_sa_eps_export.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_sa_eps_export.h"
 # include "sr_sa_bbox.h"
 # include "sr_sn_shape.h"
diff --git a/source/dcdt/se/sr_sa_event.cpp b/source/dcdt/se/sr_sa_event.cpp
index ae147dc074..f4c725fe0d 100644
--- a/source/dcdt/se/sr_sa_event.cpp
+++ b/source/dcdt/se/sr_sa_event.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 //# include <stdlib.h>
 
 # include "sr_sn_editor.h"
diff --git a/source/dcdt/se/sr_sa_model_export.cpp b/source/dcdt/se/sr_sa_model_export.cpp
index c7b5eb6b41..511afb811a 100644
--- a/source/dcdt/se/sr_sa_model_export.cpp
+++ b/source/dcdt/se/sr_sa_model_export.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_sa_model_export.h"
 # include "sr_model.h"
 # include "sr_sn_shape.h"
diff --git a/source/dcdt/se/sr_sa_render_mode.cpp b/source/dcdt/se/sr_sa_render_mode.cpp
index 0aa775ddea..7b25f57400 100644
--- a/source/dcdt/se/sr_sa_render_mode.cpp
+++ b/source/dcdt/se/sr_sa_render_mode.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 //# include <stdlib.h>
 
 # include "sr_sa_render_mode.h"
diff --git a/source/dcdt/se/sr_set.cpp b/source/dcdt/se/sr_set.cpp
index 3b8e2d859c..daabc4fc95 100644
--- a/source/dcdt/se/sr_set.cpp
+++ b/source/dcdt/se/sr_set.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <stdlib.h>
 # include "sr_set.h"
 
diff --git a/source/dcdt/se/sr_sn.cpp b/source/dcdt/se/sr_sn.cpp
index 7c8bef3d78..e74d2cc7ee 100644
--- a/source/dcdt/se/sr_sn.cpp
+++ b/source/dcdt/se/sr_sn.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_sn.h"
 
 //# define SR_USE_TRACE1  // SrSn Const/Dest
diff --git a/source/dcdt/se/sr_sn_editor.cpp b/source/dcdt/se/sr_sn_editor.cpp
index 674e084a0c..8e3b13e873 100644
--- a/source/dcdt/se/sr_sn_editor.cpp
+++ b/source/dcdt/se/sr_sn_editor.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_sn_editor.h"
 
 //# define SR_USE_TRACE1  // SrSn Const/Dest
diff --git a/source/dcdt/se/sr_sn_group.cpp b/source/dcdt/se/sr_sn_group.cpp
index b6cc9bc2db..d0215061f0 100644
--- a/source/dcdt/se/sr_sn_group.cpp
+++ b/source/dcdt/se/sr_sn_group.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_sn_group.h"
 
 //# define SR_USE_TRACE1  // Const/Dest
diff --git a/source/dcdt/se/sr_sn_manipulator.cpp b/source/dcdt/se/sr_sn_manipulator.cpp
index f8e98070c6..9a454d8485 100644
--- a/source/dcdt/se/sr_sn_manipulator.cpp
+++ b/source/dcdt/se/sr_sn_manipulator.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <math.h>
 
 # include "sr_sn_manipulator.h"
diff --git a/source/dcdt/se/sr_sn_matrix.cpp b/source/dcdt/se/sr_sn_matrix.cpp
index 73f574150e..430820fc03 100644
--- a/source/dcdt/se/sr_sn_matrix.cpp
+++ b/source/dcdt/se/sr_sn_matrix.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_sn_matrix.h"
 
 //# define SR_USE_TRACE1  // Const/Dest
diff --git a/source/dcdt/se/sr_sn_polygon_editor.cpp b/source/dcdt/se/sr_sn_polygon_editor.cpp
index 1addd592bc..c18871a8ef 100644
--- a/source/dcdt/se/sr_sn_polygon_editor.cpp
+++ b/source/dcdt/se/sr_sn_polygon_editor.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_sn_polygon_editor.h"
 
 //============================ SrSnPolygonEditor ====================================
diff --git a/source/dcdt/se/sr_sn_shape.cpp b/source/dcdt/se/sr_sn_shape.cpp
index 1df40a2cd2..13180ebd5c 100644
--- a/source/dcdt/se/sr_sn_shape.cpp
+++ b/source/dcdt/se/sr_sn_shape.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_sn_shape.h"
 
 //# define SR_USE_TRACE1  // Const/Dest
diff --git a/source/dcdt/se/sr_sphere.cpp b/source/dcdt/se/sr_sphere.cpp
index ba50a2dd31..902ac6be73 100644
--- a/source/dcdt/se/sr_sphere.cpp
+++ b/source/dcdt/se/sr_sphere.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_sphere.h"
 # include "sr_box.h"
 
diff --git a/source/dcdt/se/sr_spline.cpp b/source/dcdt/se/sr_spline.cpp
index f5b66e8ac1..3b014fc8d8 100644
--- a/source/dcdt/se/sr_spline.cpp
+++ b/source/dcdt/se/sr_spline.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 //# include <math.h>
 # include "sr_spline.h"
 
diff --git a/source/dcdt/se/sr_string.cpp b/source/dcdt/se/sr_string.cpp
index 5882099576..a500f563cf 100644
--- a/source/dcdt/se/sr_string.cpp
+++ b/source/dcdt/se/sr_string.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h" 
+#include "0ad_warning_disable.h"
 # include <ctype.h>
 # include <string.h>
 # include <stdlib.h>
@@ -77,7 +78,7 @@ SrString& SrString::set ( const char *st )
     { if ( _capacity ) _data[0]=0;
     }
    else 
-    { int size = strlen(st)+1;
+    { int size = (int)strlen(st)+1;
       if ( _capacity<size )
        { if ( _data!=_empty ) delete[] _data;
          _capacity = size;
@@ -140,7 +141,7 @@ void SrString::compress ()
  {
    if ( !_capacity ) return;
 
-   int len = strlen(_data);
+   int len = (int)strlen(_data);
 
    if ( len+1==_capacity ) return; // is compressed
 
@@ -194,7 +195,7 @@ void SrString::bounds ( int &xi, int &xf ) const
 void SrString::substring ( int inf, int sup )
  {
    int n=0;
-   int max=strlen(_data)-1;
+   int max=(int)strlen(_data)-1;
    
    if ( max<0 ) return;
    if ( inf<0 ) inf=0;
@@ -206,21 +207,21 @@ void SrString::substring ( int inf, int sup )
 
 char SrString::last_char () const
  {
-   int len = strlen(_data);
+   int len = (int)strlen(_data);
    if ( len==0 ) return 0;
    return _data[len-1];
  }
 
 void SrString::last_char ( char c )
  {
-   int len = strlen(_data);
+   int len = (int)strlen(_data);
    if ( len==0 ) return;
    _data[len-1] = c;
  }
 
 void SrString::get_substring ( SrString& s, int inf, int sup ) const
  {
-   int max=strlen(_data)-1;
+   int max=(int)strlen(_data)-1;
    if ( max<0 ) return;
    if ( sup<0 || sup>max ) sup=max;
    if ( inf<0 ) inf=0;
@@ -234,7 +235,7 @@ void SrString::get_substring ( SrString& s, int inf, int sup ) const
 int SrString::get_next_string ( SrString& s, int i ) const
  {
    int i1, i2;
-   int max=strlen(_data)-1;
+   int max=(int)strlen(_data)-1;
 
    if ( max<0 ) return -1;
    if ( i<0 ) i=0;
@@ -267,7 +268,7 @@ void SrString::upper ()
 
 int SrString::search ( char c ) const
  {
-   int len = strlen(_data);
+   int len = (int)strlen(_data);
    for ( int i=0; i<len; i++ ) if (_data[i]==c) return i;
    return -1;
  }
@@ -275,10 +276,10 @@ int SrString::search ( char c ) const
 int SrString::search ( const char *st, bool ci ) const
  {
    int cmp;
-   int len = strlen(st);
+   int len = (int)strlen(st);
    if ( len==0 ) return -1;
 
-   int last_index = strlen(_data)-len;
+   int last_index = (int)strlen(_data)-len;
    for ( int i=0; i<=last_index; i++ )
     { cmp = ci? sr_compare ( _data+i, st, len ) :
                 sr_compare_cs ( _data+i, st, len );
@@ -414,7 +415,7 @@ bool SrString::make_valid_string ( const char* s )
    bool need_slash = false;
 
    int i;
-   int len = strlen ( s );
+   int len = (int)strlen ( s );
 
    if ( len==0 )
      need_quotes = true;
@@ -471,7 +472,7 @@ void SrString::append ( const char* st )
    char *tmp = 0;
    if ( st==_data ) { tmp=sr_string_new(st); st=tmp; }
 
-   int newlen = strlen(_data)+strlen(st);
+   int newlen = (int)strlen(_data)+(int)strlen(st);
 
    if ( newlen<_capacity )
     { strcat(_data,st);
@@ -491,10 +492,10 @@ void SrString::insert ( int i, const char *st )
    if ( !st ) return;
    if ( i<0 ) i=0;
    
-   int len = strlen(_data);
+   int len = (int)strlen(_data);
    if ( i>=len ) { append(st); return; }
 
-   int dp = strlen ( st );
+   int dp = (int)strlen ( st );
    if ( !dp ) return;
 
    int ns = len+dp+1;
@@ -516,7 +517,7 @@ void SrString::insert ( int i, const char *st )
 void SrString::remove ( int i, int dp )
  {
    if ( _data==_empty || dp<=0 ) return;
-   int len = strlen(_data);
+   int len = (int)strlen(_data);
    if ( i>=len || i<0 ) return;
    if ( i+dp>=len ) { _data[i]=0; return; }
 
@@ -531,8 +532,8 @@ int SrString::replace ( const char* oldst, const char* newst, bool ci )
 
    if ( i<0 ) return i; // not found
 
-   int oldlen = strlen(oldst);
-   int newlen = newst? strlen(newst):0;
+   int oldlen = (int)strlen(oldst);
+   int newlen = newst? (int)strlen(newst):0;
    
    if ( oldlen<newlen ) // open space
     { SrString dif ( ' ', newlen-oldlen );
diff --git a/source/dcdt/se/sr_string_array.cpp b/source/dcdt/se/sr_string_array.cpp
index e5ecab102d..2223eb3c21 100644
--- a/source/dcdt/se/sr_string_array.cpp
+++ b/source/dcdt/se/sr_string_array.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_string_array.h"
 
 //# define SR_USE_TRACE1
diff --git a/source/dcdt/se/sr_time.cpp b/source/dcdt/se/sr_time.cpp
index 17b43d7e78..f87b00b191 100644
--- a/source/dcdt/se/sr_time.cpp
+++ b/source/dcdt/se/sr_time.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_time.h"
 # include "sr_string.h"
 
diff --git a/source/dcdt/se/sr_trackball.cpp b/source/dcdt/se/sr_trackball.cpp
index 6fe075fd49..af6beb3205 100644
--- a/source/dcdt/se/sr_trackball.cpp
+++ b/source/dcdt/se/sr_trackball.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <math.h>
  
 # include "sr_trackball.h"
diff --git a/source/dcdt/se/sr_tree.cpp b/source/dcdt/se/sr_tree.cpp
index 84d1866cbb..2642de1dec 100644
--- a/source/dcdt/se/sr_tree.cpp
+++ b/source/dcdt/se/sr_tree.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_tree.h"
 
 //# define SR_USE_TRACE1   
diff --git a/source/dcdt/se/sr_triangle.cpp b/source/dcdt/se/sr_triangle.cpp
index 207f012e49..da37f6f826 100644
--- a/source/dcdt/se/sr_triangle.cpp
+++ b/source/dcdt/se/sr_triangle.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 //# include <math.h>
 # include "sr_triangle.h"
 //# include "sr_vec2.h"
diff --git a/source/dcdt/se/sr_triangulation.cpp b/source/dcdt/se/sr_triangulation.cpp
index 1b62c23145..8dfcfdf051 100644
--- a/source/dcdt/se/sr_triangulation.cpp
+++ b/source/dcdt/se/sr_triangulation.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include "sr_random.h"
 # include "sr_geo2.h"
 # include "sr_triangulation.h"
diff --git a/source/dcdt/se/sr_var.cpp b/source/dcdt/se/sr_var.cpp
index c07907fd4a..8ec81063a6 100644
--- a/source/dcdt/se/sr_var.cpp
+++ b/source/dcdt/se/sr_var.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <ctype.h>
 # include <string.h>
 # include <stdlib.h>
@@ -378,7 +379,7 @@ SrOutput& operator<< ( SrOutput& o, const SrVar& v )
 
       case 's': for ( i=0; i<s; i++ ) 
                  { outs(o,i,v._data[i].s,buf);
-                   len += strlen(v._data[i].s);
+                   len += (int)strlen(v._data[i].s);
                    if (i<e)
                     { if ( len>80 ) { o<<srnl<<srtab; len=0; }
                        else o<<srspc;
diff --git a/source/dcdt/se/sr_var_table.cpp b/source/dcdt/se/sr_var_table.cpp
index b61447ae48..edac6fd1ca 100644
--- a/source/dcdt/se/sr_var_table.cpp
+++ b/source/dcdt/se/sr_var_table.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <stdlib.h>
 # include "sr_var_table.h"
 
diff --git a/source/dcdt/se/sr_vec.cpp b/source/dcdt/se/sr_vec.cpp
index d0dda80972..331979932c 100644
--- a/source/dcdt/se/sr_vec.cpp
+++ b/source/dcdt/se/sr_vec.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <math.h>
 # include "sr_vec.h"
 # include "sr_vec2.h"
diff --git a/source/dcdt/se/sr_vec2.cpp b/source/dcdt/se/sr_vec2.cpp
index 45fb93fbde..4b981a084a 100644
--- a/source/dcdt/se/sr_vec2.cpp
+++ b/source/dcdt/se/sr_vec2.cpp
@@ -1,4 +1,5 @@
 #include "precompiled.h"
+#include "0ad_warning_disable.h"
 # include <math.h>
 # include "sr_vec2.h"
 # include "sr_geo2.h"