Changeset 5143 in orxonox.OLD

Timestamp:

Aug 27, 2005, 12:32:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor cleanup

Location:

trunk/src

Files:

• defs/functor_list.h (modified) (2 diffs)
• lib/event/event.h (modified) (1 diff)
• lib/event/event_listener.h (modified) (2 diffs)
• lib/physics/physics_interface.h (modified) (1 diff)
• util/shell_command.cc (modified) (2 diffs)
• util/shell_command.h (modified) (3 diffs)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/player.cc (modified) (2 diffs)
• world_entities/terrain.cc (modified) (1 diff)
• world_entities/weapons/weapon.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (3 diffs)

trunk/src/defs/functor_list.h

@@ -32 +32 @@
 #define FUNCTOR_MAX_ARGUMENTS                5
 
-typedef enum ParameterType
+typedef enum
 {
   ParameterNull,
@@ -43 +43 @@
   ParameterLong,
   /* ... */
-};
+} ParameterType;
 
 

trunk/src/lib/event/event.h

@@ -11 +11 @@
 
 #include "base_object.h"
-#include "event_def.h"
 #include "sdlincl.h"
-
 
 //! An abstract event class

trunk/src/lib/event/event_listener.h

@@ -1 @@
-/*! 
+/*!
  * @file event_listener.h
   *  Definition of an event listener base class
@@ -10 +10 @@
 #include "base_object.h"
 #include "event.h"
-#include "event_def.h"
-
 
 //! A class for event listener

trunk/src/lib/physics/physics_interface.h

@@ -7 +7 @@
 #define _PHYSICS_INTERFACE_H
 
+#include "base_object.h"
+
 #include "vector.h"
-#include "base_object.h"
 
 #ifndef NULL

trunk/src/util/shell_command.cc

@@ -48 +48 @@
     paramCount = FUNCTOR_MAX_ARGUMENTS;
   this->paramCount = paramCount;
-  this->parameters = new ParameterType[paramCount];
+  this->parameters = new long[paramCount];
 
   for (unsigned int i = 0; i < paramCount; i++)
@@ -146 +146 @@
           commandBegin++;
         if (strncmp (commandBegin, elem->getName(), strlen(elem->getName())))
-            continue;
+          continue;
         objectPointer = ClassList::getList(elem->classID)->firstElement();
       }
       else
       {
+        while(*commandBegin == ' ')
+          commandBegin++;
+        tIterator<BaseObject>* iterBO = ClassList::getList(elem->classID)->getIterator();
+        BaseObject* enumBO = iterBO->firstElement();
+        {
+          if( !strncmp(commandBegin, enumBO->getName(), strlen(enumBO->getName())))
+          {
+            objectPointer = enumBO;
+            break;
+          }
+          enumBO = iterBO->nextElement();
+        }
+        delete iterBO;
 
+        if (objectPointer == NULL)
+          break;
+        commandBegin = commandBegin + strlen(objectPointer->getName());
+        while(*commandBegin == ' ')
+          commandBegin++;
       }
       const char* commandEnd = strchr(commandBegin, ' ');
       if (commandEnd == NULL)
-        commandEnd = executionString + strlen(executionString);
+        commandEnd = commandBegin + strlen(commandBegin);
 
       if (objectPointer != NULL)
+      {
         elem->executeCommand(objectPointer, commandEnd);
-      delete iterator;
-      return true;
+        delete iterator;
+        return true;
+      }
     }
     elem = iterator->nextElement();

trunk/src/util/shell_command.h

@@ -10 +10 @@
 
 #include "helper_functions.h"
+#include "functor_list.h"
 
 #include <stdarg.h>
@@ -15 +16 @@
 #define MAX_SHELL_COMMAND_SIZE
 
-#include "functor_list.h"
 
 
@@ -94 +94 @@
     void*                            functionPointer;     //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
     unsigned int                     paramCount;          //!< the count of parameters
-    ParameterType*                   parameters;          //!< Parameters
+    long*                            parameters;          //!< Parameters
     bool                             isSingleton;         //!< if the Class is Singleton @todo autocheck
 

trunk/src/world_entities/environment.cc

@@ -18 +18 @@
 
 #include "environment.h"
-#include "stdincl.h"
-#include "world_entity.h"
+
+#include "resource_manager.h"
+
 #include "vector.h"
 #include "objModel.h"

trunk/src/world_entities/player.cc

@@ -18 +18 @@
 #include "player.h"
 
+#include "shell_command.h"
 #include "track_manager.h"
 #include "objModel.h"
@@ -114 +115 @@
 
 
+  ShellCommand<Player>::registerCommand("init", CL_PLAYER, &Player::init);
   //this->weaponMan->addWeapon(turret, 3, 0);
 

trunk/src/world_entities/terrain.cc

@@ -23 +23 @@
 #include "factory.h"
 #include "load_param.h"
-
+#include "resource_manager.h"
 #include "spatial_separation.h"
 

trunk/src/world_entities/weapons/weapon.cc

@@ -23 +23 @@
 #include "projectile.h"
 
+#include "resource_manager.h"
 #include "class_list.h"
 #include "load_param.h"

trunk/src/world_entities/world_entity.cc

@@ -19 +19 @@
 
 #include "world_entity.h"
+
+#include "resource_manager.h"
+#include "load_param.h"
 #include "list.h"
 #include "vector.h"

trunk/src/world_entities/world_entity.h

@@ -8 +8 @@
 
 #include "p_node.h"
-#include "resource_manager.h"
+
 #include "factory.h"
-#include "load_param.h"
-#include "bv_tree.h"
 #include "model.h"
 
@@ -20 +18 @@
 class SoundBuffer;
 class SoundSource;
+class BVTree;
 
 
@@ -50 +49 @@
 
   /** @returns a reference to the obb tree of this worldentity */
-  BVTree* getOBBTree() { return this->obbTree; }
+  BVTree* getOBBTree() { return this->obbTree; };
 
   virtual void postSpawn ();