Merge pull request H-uru#225 from zrax/warn_cleanup

Warning cleanup
Deledrius · Nov 13, 2012 · 69760fc · 69760fc
2 parents bc72a45 + 4016954
commit 69760fc
Show file tree

Hide file tree

Showing 41 changed files with 22 additions and 1,131 deletions.
diff --git a/Sources/Plasma/CoreLib/hsFastMath.cpp b/Sources/Plasma/CoreLib/hsFastMath.cpp
@@ -604,7 +604,7 @@ float hsFastMath::IATan2OverTwoPi(float y, float x)
     if( (x == 0)&&(y == 0) )
         return 0;
 
-    bool xNeg, yNeg;
+    int xNeg, yNeg;
     if((yNeg = (y < 0)))y = -y;
     if((xNeg = (x < 0)))x = -x;
     bool yBigger = y >= x;

diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
@@ -113,7 +113,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnMessage/plProxyDrawMsg.h"
 #include "pnMessage/plObjRefMsg.h"
 #include "pnMessage/plAttachMsg.h"
-#include "plMessage/plSimInfluenceMsg.h"
 #include "plMessage/plSimStateMsg.h"
 #include "plMessage/plLinkToAgeMsg.h"
 #include "pfMessage/pfKIMsg.h"

diff --git a/Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp b/Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp
@@ -565,7 +565,7 @@ uint8_t   pfConsoleCmd::GetSigEntry( uint8_t i )
 
 const char  *pfConsoleCmd::GetSignature( void )
 {
-    char string[256];
+    static char string[256];
 
     int     i;
     char    pStr[ 128 ];

diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt
@@ -200,8 +200,6 @@ set(pfPython_GLUE
     pyAgeLinkStructGlue.cpp
     pyAgeVaultGlue.cpp
     pyAudioControlGlue.cpp
-    pyCCRMgrGlue.cpp
-    pyCCRMgrGlue2.cpp
     pyClusterGlue.cpp
     pyColorGlue.cpp
     pyCritterBrainGlue.cpp

diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
@@ -85,6 +85,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyAgeInfoStruct.h"
 #include "pyAgeLinkStruct.h"
 #include "pyAlarm.h"
+#include "pyGeometry3.h"
 #include "pfMessage/pfKIMsg.h"
 #include "plNetMessage/plNetMessage.h"
 #include "pfCamera/plVirtualCamNeu.h"

diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp
@@ -53,7 +53,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pnMessage/plEnableMsg.h"
 #include "pnMessage/plWarpMsg.h"
-#include "plMessage/plSimInfluenceMsg.h"
 #include "plMessage/plSimStateMsg.h"
 #include "plMessage/plLinearVelocityMsg.h"
 #include "plMessage/plAngularVelocityMsg.h"

diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp
@@ -51,6 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pyGUIDialog.h"
 #include "pyColor.h"
+#include "pyGeometry3.h"
 
 #include "pyGUIControlCheckBox.h"
 

diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h
@@ -54,6 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 class pyGUIDialog;
 class pyColor;
+class pyPoint3;
 
 class pyGUIControl
 {

diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp
@@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pyGUIControlClickMap.h"
 #include "pyGUIDialog.h"
+#include "pyGeometry3.h"
 
 pyGUIControlClickMap::pyGUIControlClickMap(pyKey& gckey) : pyGUIControl(gckey)
 {

diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp
@@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pyGUIControlDraggable.h"
 #include "pyGUIDialog.h"
+#include "pyGeometry3.h"
 
 pyGUIControlDraggable::pyGUIControlDraggable(pyKey& gckey) : pyGUIControl(gckey)
 {

diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp
@@ -45,6 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #pragma hdrstop
 
 #include "pyGUIControl.h"
+#include "pyGeometry3.h"
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptGUIControl, pyGUIControl);

diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp
@@ -46,6 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #pragma hdrstop
 
 #include "pyImage.h"
+#include "pyGeometry3.h"
 #include "plJPEG/plJPEG.h"
 #include "plGImage/plPNG.h"
 #include "pnKeyedObject/plUoid.h"

diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.cpp b/Sources/Plasma/NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.cpp
diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt
@@ -2,52 +2,25 @@ include_directories("../../CoreLib")
 include_directories("../../NucleusLib")
 include_directories("../../NucleusLib/inc")
 
-set(pnGameMgr_BLUESPIRAL
+set(pnGameMgr_GAMES
     BlueSpiral/pnGmBlueSpiral.h
-    BlueSpiral/pnGmBlueSpiral.cpp
-)
-
-set(pnGameMgr_CLIMBINGWALL
     ClimbingWall/pnGmClimbingWall.h
-    ClimbingWall/pnGmClimbingWall.cpp
-)
-
-set(pnGameMgr_HEEK
     Heek/pnGmHeek.h
-    Heek/pnGmHeek.cpp
-)
-
-set(pnGameMgr_MARKER
     Marker/pnGmMarker.h
-    Marker/pnGmMarker.cpp
-)
-
-set(pnGameMgr_TICTACTOE
     TicTacToe/pnGmTicTacToe.h
-    TicTacToe/pnGmTicTacToe.cpp
-)
-
-set(pnGameMgr_VARSYNC
     VarSync/pnGmVarSync.h
-    VarSync/pnGmVarSync.cpp
 )
 
 set(pnGameMgr_SOURCES
     Intern.h
     Pch.h
     pnGameMgr.h
+
+    # Needs at least one C++ file to show up in VS solution
     pnGameMgr.cpp
 )
 
-add_library(pnGameMgr STATIC ${pnGameMgr_SOURCES} ${pnGameMgr_BLUESPIRAL}
-                             ${pnGameMgr_CLIMBINGWALL} ${pnGameMgr_HEEK}
-                             ${pnGameMgr_MARKER} ${pnGameMgr_TICTACTOE}
-                             ${pnGameMgr_VARSYNC})
+add_library(pnGameMgr STATIC ${pnGameMgr_SOURCES} ${pnGameMgr_GAMES})
 
-source_group("BlueSpiral" FILES ${pnGameMgr_BLUESPIRAL})
-source_group("ClimbingWall" FILES ${pnGameMgr_CLIMBINGWALL})
-source_group("Heek" FILES ${pnGameMgr_HEEK})
-source_group("Marker" FILES ${pnGameMgr_MARKER})
-source_group("TicTacToe" FILES ${pnGameMgr_TICTACTOE})
-source_group("VarSync" FILES ${pnGameMgr_VARSYNC})
+source_group("Games" FILES ${pnGameMgr_GAMES})
 source_group("" FILES ${pnGameMgr_SOURCES})
diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.cpp b/Sources/Plasma/NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.cpp