Fixed unnecessary warnings, see http://zerowing.idsoftware.com/bugzilla/show_bug...

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@104 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/CHANGES b/CHANGES
index 5447e93cfd9b7e141f1277478dc1f74ee073f32a..99bb1fd4614dd8876c929f99aa33aec12ca4eacb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 

+11/09/2006
+namespace
+- Fixed unnecessary warnings, see http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=1108
+  for details
+

 11/09/2006
 namespace
 - Added sunplug (Mapcoordinator-plugin for ET) by Topsun
 11/09/2006
 namespace
 - Added sunplug (Mapcoordinator-plugin for ET) by Topsun

diff --git a/include/ibrush.h b/include/ibrush.h
index 8aaf4b7dce9cdcc4f129d3247b743aae4d58ce64..ddc825596c7da5c900e8d9bb1e1891fbd3be829c 100644 (file)
--- a/include/ibrush.h
+++ b/include/ibrush.h
@@ -83,7 +83,7 @@ public:
 class _QERFaceData
 {
 public:
 class _QERFaceData
 {
 public:

-  _QERFaceData() : contents(0), flags(0), value(0), m_shader("")
+  _QERFaceData() : m_shader(""), contents(0), flags(0), value(0)

   {
   }
   Vector3 m_p0;
   {
   }
   Vector3 m_p0;

diff --git a/libs/math/matrix.h b/libs/math/matrix.h
index 6039a0d352f91184c63317413f2c6880effb2af0..b28c2688e0bc9b438a42dfceb5802bec11ab2924 100644 (file)
--- a/libs/math/matrix.h
+++ b/libs/math/matrix.h
@@ -574,17 +574,17 @@ inline Matrix4 matrix4_affine_inverse(const Matrix4& self)
   // invert rotation submatrix
   det = 1.0 / det;
 
   // invert rotation submatrix
   det = 1.0 / det;
 

-  result[0] = (  (self[5]*self[10]- self[6]*self[9] )*det);
-  result[1] = (- (self[1]*self[10]- self[2]*self[9] )*det);
-  result[2] = (  (self[1]*self[6] - self[2]*self[5] )*det);
+  result[0] = static_cast<float>(  (self[5]*self[10]- self[6]*self[9] )*det);
+  result[1] = static_cast<float>(- (self[1]*self[10]- self[2]*self[9] )*det);
+  result[2] = static_cast<float>(  (self[1]*self[6] - self[2]*self[5] )*det);

   result[3] = 0;
   result[3] = 0;

-  result[4] = (- (self[4]*self[10]- self[6]*self[8] )*det);
-  result[5] = (  (self[0]*self[10]- self[2]*self[8] )*det);
-  result[6] = (- (self[0]*self[6] - self[2]*self[4] )*det);
+  result[4] = static_cast<float>(- (self[4]*self[10]- self[6]*self[8] )*det);
+  result[5] = static_cast<float>(  (self[0]*self[10]- self[2]*self[8] )*det);
+  result[6] = static_cast<float>(- (self[0]*self[6] - self[2]*self[4] )*det);

   result[7] = 0;
   result[7] = 0;

-  result[8] = (  (self[4]*self[9] - self[5]*self[8] )*det);
-  result[9] = (- (self[0]*self[9] - self[1]*self[8] )*det);
-  result[10]= (  (self[0]*self[5] - self[1]*self[4] )*det);
+  result[8] = static_cast<float>(  (self[4]*self[9] - self[5]*self[8] )*det);
+  result[9] = static_cast<float>(- (self[0]*self[9] - self[1]*self[8] )*det);
+  result[10]= static_cast<float>(  (self[0]*self[5] - self[1]*self[4] )*det);

   result[11] = 0;
 
   // multiply translation part by rotation
   result[11] = 0;
 
   // multiply translation part by rotation

diff --git a/radiant/brush.h b/radiant/brush.h
index b4c0f0934d0e7ffccc2f97bfce18cbd744257ce3..5d06d7c932a27f1d3fe3470705c8af1a4ab3b88a 100644 (file)
--- a/radiant/brush.h
+++ b/radiant/brush.h
@@ -1734,10 +1734,10 @@ public:
     m_render_faces(m_faceCentroidPoints, GL_POINTS),
     m_render_vertices(m_uniqueVertexPoints, GL_POINTS),
     m_render_edges(m_uniqueEdgePoints, GL_POINTS),
     m_render_faces(m_faceCentroidPoints, GL_POINTS),
     m_render_vertices(m_uniqueVertexPoints, GL_POINTS),
     m_render_edges(m_uniqueEdgePoints, GL_POINTS),

-    m_planeChanged(false),
-    m_transformChanged(false),

     m_evaluateTransform(evaluateTransform),
     m_evaluateTransform(evaluateTransform),

-    m_boundsChanged(boundsChanged)
+    m_boundsChanged(boundsChanged),
+    m_planeChanged(false),
+    m_transformChanged(false)

   {
     planeChanged();
   }
   {
     planeChanged();
   }


@@ -1748,10 +1748,10 @@ public:
     m_render_faces(m_faceCentroidPoints, GL_POINTS),
     m_render_vertices(m_uniqueVertexPoints, GL_POINTS),
     m_render_edges(m_uniqueEdgePoints, GL_POINTS),
     m_render_faces(m_faceCentroidPoints, GL_POINTS),
     m_render_vertices(m_uniqueVertexPoints, GL_POINTS),
     m_render_edges(m_uniqueEdgePoints, GL_POINTS),

-    m_planeChanged(false),
-    m_transformChanged(false),

     m_evaluateTransform(evaluateTransform),
     m_evaluateTransform(evaluateTransform),

-    m_boundsChanged(boundsChanged)
+    m_boundsChanged(boundsChanged),
+    m_planeChanged(false),
+    m_transformChanged(false)

   {
     copy(other);
   }
   {
     copy(other);
   }


@@ -1759,6 +1759,7 @@ public:
     TransformNode(other),
     Bounded(other),
     Cullable(other),
     TransformNode(other),
     Bounded(other),
     Cullable(other),

+    Snappable(),

     Undoable(other),
     FaceObserver(other),
     Filterable(other),
     Undoable(other),
     FaceObserver(other),
     Filterable(other),

diff --git a/radiant/patch.h b/radiant/patch.h
index e4c20e4e7ec261e3e6a60526c7efb3b3e9f7af55..2362415ebb59635601e9a3ba21341d539180e780 100644 (file)
--- a/radiant/patch.h
+++ b/radiant/patch.h
@@ -534,6 +534,7 @@ public:
     TransformNode(other),
     Bounded(other),
     Cullable(other),
     TransformNode(other),
     Bounded(other),
     Cullable(other),

+    Snappable(),

     Undoable(other),
     Filterable(other),
     Nameable(other),
     Undoable(other),
     Filterable(other),
     Nameable(other),