I'll break this commit into two sections in the moto files

I got rid of a few warnings about blah shadows a previous declaration.

In the gameengine files I fix the following:
	removed some unused vars
	removed dos style line breaks
	added newlines to last line in a couple of files to remove warnings.

Kent

diff --git a/intern/moto/include/MT_Point2.h b/intern/moto/include/MT_Point2.h
index c6995f1ab0b7cb26aa5ac6dbbd9c08e58558b5b4..cc6819039fc3a33297fa12f7904cd1520d8e4ec1 100644 (file)
--- a/intern/moto/include/MT_Point2.h
+++ b/intern/moto/include/MT_Point2.h
@@ -51,9 +51,9 @@
 class MT_Point2 : public MT_Vector2 {
 public:
     MT_Point2() {}
-    MT_Point2(const float *v) : MT_Vector2(v) {} 
-    MT_Point2(const double *v) : MT_Vector2(v) {}
-    MT_Point2(MT_Scalar x, MT_Scalar y) : MT_Vector2(x, y) {}
+    MT_Point2(const float *v2) : MT_Vector2(v2) {} 
+    MT_Point2(const double *v2) : MT_Vector2(v2) {}
+    MT_Point2(MT_Scalar x2, MT_Scalar y2) : MT_Vector2(x2, y2) {}
 
     MT_Point2& operator+=(const MT_Vector2& v);
     MT_Point2& operator-=(const MT_Vector2& v);

diff --git a/intern/moto/include/MT_Vector2.h b/intern/moto/include/MT_Vector2.h
index 35748ce2b0db486f07f76630ff0b61aea6d3981a..629d962a781278c310fb7cc5dc8df6b8423abce8 100644 (file)
--- a/intern/moto/include/MT_Vector2.h
+++ b/intern/moto/include/MT_Vector2.h
@@ -52,8 +52,8 @@
 class MT_Vector2 : public MT_Tuple2 {
 public:
     MT_Vector2() {}
-    MT_Vector2(const float *v) : MT_Tuple2(v) {}
-    MT_Vector2(const double *v) : MT_Tuple2(v) {}
+    MT_Vector2(const float *v2) : MT_Tuple2(v2) {}
+    MT_Vector2(const double *v2) : MT_Tuple2(v2) {}
     MT_Vector2(MT_Scalar xx, MT_Scalar yy) : MT_Tuple2(xx, yy) {}
   
     MT_Vector2& operator+=(const MT_Vector2& v);

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 53b775b89208503234aae41607a66d85959e05df..283710a5d5b434db7542849583aa56ada31ebcad 100644 (file)
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -177,7 +177,6 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
 
        if (blenderscene)
        {
-               int i=0;
        
                if (blenderscene->world)
                {

diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
index 7c61edd45e7ad0c3163af593df276afa110f9ea9..7441863b7b7b9fb6f58d3bb60cd03667c5851ebd 100644 (file)
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
@@ -31,10 +31,6 @@
  * KX_MouseFocusSensor determines mouse in/out/over events.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 // This warning tells us about truncation of __long__ stl-generated names.
 // It can occasionally cause DevStudio to have internal compiler warnings.
@@ -152,7 +148,6 @@ bool KX_MouseFocusSensor::RayHit(KX_ClientObjectInfo* client_info, MT_Point3& hi
 bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
 {
        
-       bool res = false;
        m_hitPosition = MT_Vector3(0,0,0);
        m_hitNormal =   MT_Vector3(1,0,0);
        MT_Point3 resultpoint;

diff --git a/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp
index 52d3888f58cb38b0142e9315ea41c66651bdf9bb..1992bbe342135ca2d18f80c607bf603c20a5b0e2 100755 (executable)
--- a/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp
+++ b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp
@@ -62,5 +62,5 @@ DT_Bool SumoPHYCallbackBridge::SolidToPHY(void *client_object1,
        return m_phyCallback(m_orgClientData,
                ctrl1,ctrl2,0);
 
+}
 
-}
\ No newline at end of file

diff --git a/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h
index 343fd7ce938e61815ee066dffba83ff84f265800..4f4d84182ae525ef3e3227bd4fbe8b3b65e076f7 100755 (executable)
--- a/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h
+++ b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h
@@ -24,4 +24,5 @@ public:
 
 
 };
-#endif //SUMO_PHY_CALLBACK_BRIDGE_H
\ No newline at end of file
+
+#endif //SUMO_PHY_CALLBACK_BRIDGE_H

diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp b/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
index 5ff47b475d1ec8bb842168301243fc00e47512c0..57922e856c4d061fc18b3f2c643ef5cb16f5653a 100644 (file)
--- a/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
+++ b/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
@@ -36,10 +36,6 @@
 #include "MT_Quaternion.h"
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 SumoPhysicsController::SumoPhysicsController(
                                class SM_Scene* sumoScene,
                                class SM_Object* sumoObj,

diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
index 2b29b2602a80281449957a21572786be6829fff0..6cd5d513357bbbb0797b7966b329d1c7ce0b69e3 100644 (file)
--- a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
@@ -36,11 +36,6 @@
 #include "SumoPHYCallbackBridge.h"
 #include <SOLID/SOLID.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 SumoPhysicsEnvironment::SumoPhysicsEnvironment()
 {
        m_fixedTimeStep = 1.f/60.f;
@@ -101,7 +96,6 @@ bool         SumoPhysicsEnvironment::proceedDeltaTime(double  curTime,float timeStep)
        } else
        {
                m_currentTime += timeStep;
-               float ticrate = 1.f/timeStep;
                result = m_sumoScene->proceed(m_currentTime, timeStep);
        }
        return result;
@@ -257,4 +251,3 @@ PHY_IPhysicsController* SumoPhysicsEnvironment::CreateConeController(float coner
        return ctrl;
 }
 
-