Changeset 340 for code/branches

Timestamp:

Nov 28, 2007, 9:36:07 PM (17 years ago)

Author:

nicolasc

Message:

applied retos proposals

Location:

code/branches/FICN/src

Files:

• inertial_node.cc (deleted)
• ogre_control.cc (deleted)
• orxonox/Flocking.h (moved) (moved from code/branches/FICN/src/Flocking.h)
• orxonox/hud/hud_overlay.h (modified) (1 diff)
• orxonox/hud/test_overlay.h (modified) (1 diff)
• orxonox/inertial_node.h (moved) (moved from code/branches/FICN/src/inertial_node.h)
• orxonox/ogre_control.h (moved) (moved from code/branches/FICN/src/ogre_control.h)
• orxonox/orxonox.cc (modified) (1 diff)
• orxonox/orxonox.h (moved) (moved from code/branches/FICN/src/orxonox.h)
• orxonox/orxonox_prerequisites.h (moved) (moved from code/branches/FICN/src/orxonox_prerequisites.h)
• orxonox/orxonox_scene.h (moved) (moved from code/branches/FICN/src/orxonox_scene.h)
• orxonox/orxonox_ship.h (moved) (moved from code/branches/FICN/src/orxonox_ship.h)
• orxonox/run_manager.h (moved) (moved from code/branches/FICN/src/run_manager.h)
• orxonox_scene.cc (deleted)
• orxonox_ship.cc (deleted)
• run_manager.cc (deleted)

code/branches/FICN/src/orxonox/hud/hud_overlay.h

@@ -33 +33 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "../orxonox_prerequisites.h"
 
 

code/branches/FICN/src/orxonox/hud/test_overlay.h

@@ -33 +33 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "../orxonox_prerequisites.h"
 
 

code/branches/FICN/src/orxonox/orxonox.cc

@@ -42 +42 @@
 #include "loader/LevelLoader.h"
 
+#include "orxonox.h"
+
+#include "Flocking.h"
+
 #include "spaceship_steering.h"
 SpaceshipSteering* steering;
+