Changeset 5816 in orxonox.OLD

Timestamp:

Nov 29, 2005, 10:39:54 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: better includes

Location:

branches/world_entities/src

Files:

• defs/globals.h (modified) (2 diffs)
• defs/stdincl.h (modified) (1 diff)
• lib/event/key_mapper.h (modified) (1 diff)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• util/loading/game_loader.h (modified) (1 diff)

branches/world_entities/src/defs/globals.h

@@ -17 +17 @@
                         "Nico Bernold - Physics\n" \
                         "David Gruetter - The ProtoType\n" \
+                        "Aaron von Schroeder - Sensors\n" \
+                        "Lukas Grauer - Phasers\n" \
                         "many more...\n"
+
 #define   ORXONOX_WEBPAGE                  "http://www.orxonox.net"
 
@@ -90 +93 @@
 "any later version.\n"
 
+
+
 #define GNU_LICENCE_LONG \
 "                    GNU GENERAL PUBLIC LICENSE\n" \

branches/world_entities/src/defs/stdincl.h

@@ -17 +17 @@
 #endif
 
-#include <stdlibincl.h>
+#include "stdlibincl.h"
 
 #include "sdlincl.h"
 #include "glincl.h"
 
-#include "error.h"
-#include "globals.h"
-
 #include "compiler.h"
 

branches/world_entities/src/lib/event/key_mapper.h

@@ -29 +29 @@
   virtual ~KeyMapper();
 
-  void loadKeyBindings(const char* fileName = DEFAULT_CONFIG_FILE);
+  void loadKeyBindings(const char* fileName = NULL);
   void loadKeyBindings(IniParser* iniParser);
 

branches/world_entities/src/lib/graphics/graphics_engine.cc

@@ -30 +30 @@
 #include "text.h"
 
+#include "globals.h"
 
 #ifdef __WIN32__

branches/world_entities/src/orxonox.cc

@@ -27 +27 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_ORXONOX
 #include "orxonox.h"
+
+#include "globals.h"
 
 #include "gui.h"

branches/world_entities/src/story_entities/world.cc

@@ -1043 +1043 @@
 
 
-
-/**
-  \brief commands that the world must catch
-  @returns false if not used by the world
-*/
-bool World::command(Command* cmd)
-{
-  if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW0)) this->localCamera->setViewMode(VIEW_NORMAL);
-  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW1)) this->localCamera->setViewMode(VIEW_BEHIND);
-  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW2)) this->localCamera->setViewMode(VIEW_FRONT);
-  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW3)) this->localCamera->setViewMode(VIEW_LEFT);
-  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW4)) this->localCamera->setViewMode(VIEW_RIGHT);
-  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW5)) this->localCamera->setViewMode(VIEW_TOP);
-  return false;
-}
-
 void World::setPath( const char* name)
 {

branches/world_entities/src/util/loading/game_loader.h

@@ -12 +12 @@
 #include "event_listener.h"
 
+#include "error.h"
 
 //-----------------------------------------------------------------------------