Changeset 1784 for code/trunk/src/orxonox

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

Files:

• Settings.h (modified) (1 diff)
• gui/OgreCEGUIRenderer.h (modified) (2 diffs)
• gui/OgreCEGUIResourceProvider.h (modified) (2 diffs)
• gui/OgreCEGUITexture.h (modified) (2 diffs)
• objects/Ambient.cc (modified) (1 diff)
• objects/Camera.cc (modified) (1 diff)
• objects/SpaceShipAI.cc (modified) (1 diff)
• objects/SpaceShipAI.h (modified) (1 diff)
• overlays/OverlayText.cc (modified) (1 diff)
• overlays/console/InGameConsole.cc (modified) (1 diff)

code/trunk/src/orxonox/Settings.h

@@ -43 +43 @@
 #include "util/Debug.h"
 #include "util/MultiType.h"
-#include "util/Convert.h"
 
 namespace orxonox

code/trunk/src/orxonox/gui/OgreCEGUIRenderer.h

@@ -27 +27 @@
     This file contains code that is specific to Ogre (http://www.ogre3d.org)
 *************************************************************************/
-#ifndef _OgreCEGUIRenderer_h_
-#define _OgreCEGUIRenderer_h_
+#ifndef _OgreCEGUIRenderer_H__
+#define _OgreCEGUIRenderer_H__
 
 #include <CEGUIBase.h>
@@ -462 +462 @@
 
 
-#endif  // end of guard _OgreCEGUIRenderer_h_
+#endif  // end of guard _OgreCEGUIRenderer_H__

code/trunk/src/orxonox/gui/OgreCEGUIResourceProvider.h

@@ -24 +24 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *************************************************************************/
-#ifndef _OgreCEGUIResourceProvider_h_
-#define _OgreCEGUIResourceProvider_h_
+#ifndef _OgreCEGUIResourceProvider_H__
+#define _OgreCEGUIResourceProvider_H__
 
 #include <CEGUIResourceProvider.h>
@@ -50 +50 @@
 } // End of  CEGUI namespace section
 
-#endif  // end of guard _OgreCEGUIResourceProvider_h_
+#endif  // end of guard _OgreCEGUIResourceProvider_H__

code/trunk/src/orxonox/gui/OgreCEGUITexture.h

@@ -24 +24 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *************************************************************************/
-#ifndef _OgreCEGUITexture_h_
-#define _OgreCEGUITexture_h_
+#ifndef _OgreCEGUITexture_H__
+#define _OgreCEGUITexture_H__
 
 #include <CEGUIBase.h>
@@ -177 +177 @@
 
 
-#endif  // end of guard _OgreCEGUITexture_h_
+#endif  // end of guard _OgreCEGUITexture_H__

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
     {

code/trunk/src/orxonox/overlays/OverlayText.cc

@@ -34 +34 @@
 #include <OgrePanelOverlayElement.h>
 
-#include "util/Convert.h"
 #include "util/String.h"
 #include "core/CoreIncludes.h"

code/trunk/src/orxonox/overlays/console/InGameConsole.cc

@@ -50 +50 @@
 #include "GraphicsEngine.h"
 
-#define LINES 30
-#define CHAR_WIDTH 7.45 // fix this please - determine the char-width dynamically
-
 namespace orxonox
 {
+    const int LINES = 30;
+    const float CHAR_WIDTH = 7.45f; // fix this please - determine the char-width dynamically
+
     SetConsoleCommand(InGameConsole, openConsole, true);
     SetConsoleCommand(InGameConsole, closeConsole, true);