Changeset 1784 for code/trunk/src/orxonox/objects

Timestamp:

Sep 15, 2008, 10:54:25 AM (16 years ago)

Author:

rgrieder

Message:

• removed obsolete Convert.h includes (possibly from old XML loading)
• replaced tabs in audio library, plus minor code cleanup because removing the tabs screwed layout
• replaced all "#define name number" with "const Type name = number" if possible

Location:

code/trunk/src/orxonox/objects

Files:

• Ambient.cc (modified) (1 diff)
• Camera.cc (modified) (1 diff)
• SpaceShipAI.cc (modified) (1 diff)
• SpaceShipAI.h (modified) (1 diff)

code/trunk/src/orxonox/objects/Ambient.cc

@@ -37 +37 @@
 #include "tinyxml/tinyxml.h"
 #include "util/SubString.h"
-#include "util/Convert.h"
 #include "util/Math.h"
 #include "util/Debug.h"

code/trunk/src/orxonox/objects/Camera.cc

@@ -40 +40 @@
 #include "tinyxml/tinyxml.h"
 #include "util/SubString.h"
-#include "util/Convert.h"
 #include "util/Math.h"
 #include "util/Debug.h"

code/trunk/src/orxonox/objects/SpaceShipAI.cc

@@ -41 +41 @@
 #include "Settings.h"
 
-#define ACTION_INTERVAL 1.0f
 
 namespace orxonox
 {
+    const float ACTION_INTERVAL = 1.0f;
+
     SetConsoleCommand(SpaceShipAI, createEnemy, true).defaultValue(0, 1);
     SetConsoleCommand(SpaceShipAI, killEnemies, true).defaultValue(0, 0);

code/trunk/src/orxonox/objects/SpaceShipAI.h

@@ -36 +36 @@
 #include "util/Math.h"
 
-#define NUM_AI_TEAMS 3
 
 namespace orxonox
 {
+    const int NUM_AI_TEAMS = 3;
+
     class SpaceShipAI : public SpaceShip
     {