Changeset 9513 in orxonox.OLD

Timestamp:

Jul 27, 2006, 5:38:53 PM (18 years ago)

Author:

bensch

Message:

toList editable

Location:

branches/proxy/src

Files:

• lib/network/server_socket.h (modified) (1 diff)
• util/object_manager.cc (modified) (3 diffs)
• util/object_manager.h (modified) (2 diffs)
• world_entities/npcs/ground_turret.cc (modified) (1 diff)
• world_entities/weapons/aim.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (3 diffs)
• world_entities/world_entity.h (modified) (1 diff)

branches/proxy/src/lib/network/server_socket.h

@@ -1 +1 @@
 /*!
  * @file server_socket.h
- *  waits for incoming connections
-
+ * waits for incoming connections and handles them.
+ *
  */
 

branches/proxy/src/util/object_manager.cc

@@ -134 +134 @@
   if (omList != OM_INIT || omList == OM_SIZE)
   {
-    PRINT(0)(" +ObjectManager-LIST: '%s'==size='%d'==---\n", ObjectManager::OMListToString((OM_LIST)omList), this->objectLists[omList].size());
+    PRINT(0)(" +ObjectManager-LIST: '%s'==size='%d'==---\n", ObjectManager::OMListToString((OM_LIST)omList).c_str(), this->objectLists[omList].size());
   //  if (level >= 1)
     {
@@ -174 +174 @@
  * @returns the String transformed from omList.
  */
-const char* ObjectManager::OMListToString(OM_LIST omList)
+const std::string& ObjectManager::OMListToString(OM_LIST omList)
 {
   if (omList == OM_INIT || omList == OM_SIZE)
-    return "===invalid===";
+    return ObjectManager::objectManagerListNames[0];
 
   printf("%d\n", omList);
@@ -199 +199 @@
     }
   }
-  return OM_DEFAULT_LIST;
-}
-
-
-
-const char* ObjectManager::objectManagerListNames[] = {
+  return OM_NULL;
+}
+
+
+
+const std::string ObjectManager::objectManagerListNames[] = {
     "null",
     "dead",

branches/proxy/src/util/object_manager.h

@@ -96 +96 @@
 
   static OM_LIST StringToOMList(const std::string& listName);
-  static const char* OMListToString(OM_LIST omList);
+  static const std::string& OMListToString(OM_LIST omList);
 
 
@@ -113 +113 @@
   EntityList                              objectLists[OM_SIZE];     //!< The ObjectLists.
 
-  static const char*                      objectManagerListNames[]; //!< Names of all the lists
+  static const std::string                objectManagerListNames[]; //!< Names of all the lists
 
   EntityList                              reflectionList;           //!< A list of all reflected objects in the world

branches/proxy/src/world_entities/npcs/ground_turret.cc

@@ -80 +80 @@
 
 /**
- * loads a GroundTurret from a XML-element
+ * @brief loads a GroundTurret from a XML-element
  * @param root the XML-element to load from
  * @todo make the class Loadable

branches/proxy/src/world_entities/weapons/aim.h

@@ -37 +37 @@
 
   inline void selectTarget(PNode* target) { this->setParent(target); };
-  inline PNode* getTarget(PNode* target) { return this->getParent(); };
+  inline PNode* getTarget(PNode* target) const { return this->getParent(); };
 
   void searchTarget();
 
-  void setRange(float range){this->range = range;};
-  void setAngle(float angle){this->angle = angle;};
-  void setGroup(OM_LIST group){this->group = group;};
+  void setRange(float range) {this->range = range;};
+  void setAngle(float angle) {this->angle = angle;};
+  void setGroup(OM_LIST group) {this->group = group;};
 
   void setSize(float size);

branches/proxy/src/world_entities/world_entity.cc

@@ -141 +141 @@
   .describe("The Health the WorldEntity has at this moment")
   .defaultValues(1.0f);
+
+  LoadParam(root, "list", this, WorldEntity, toListS);
 }
 
@@ -478 +480 @@
 }
 
+void WorldEntity::toListS(const std::string& listName)
+{
+  OM_LIST id = ObjectManager::StringToOMList(listName);
+  if (id != OM_NULL)
+    this->toList(id);
+  else
+    PRINTF(2)("List %s not found\n", listName.c_str());
+}
+
+
 void WorldEntity::toReflectionList()
 {
@@ -822 +834 @@
   PRINT(0)("WorldEntity %s::%s  (DEBUG)\n", this->getClassCName(), this->getCName());
   this->debugNode();
-  PRINT(0)("List: %s ; ModelCount %d - ", ObjectManager::OMListToString(this->objectListNumber) , this->models.size());
+  PRINT(0)("List: %s ; ModelCount %d - ", ObjectManager::OMListToString(this->objectListNumber).c_str(), this->models.size());
   for (unsigned int i = 0; i < this->models.size(); i++)
   {

branches/proxy/src/world_entities/world_entity.h

@@ -115 +115 @@
   /* --- Object Manager Block --- */
   void toList(OM_LIST list);
+  void toListS(const std::string& listName);
 
   void toReflectionList();