Changeset 9869 in orxonox.OLD for trunk/src/story_entities/multi_player_world_data.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/story_entities/multi_player_world_data.cc (modified) (6 diffs)

trunk/src/story_entities/multi_player_world_data.cc

@@ -18 +18 @@
 #include "multi_player_world_data.h"
 
-#include "util/loading/resource_manager.h"
 #include "state.h"
-#include "class_list.h"
 #include "substring.h"
 
@@ -40 +38 @@
 
 #include "util/loading/factory.h"
-#include "fast_factory.h"
+#include "loading/fast_factory.h"
 #include "util/loading/load_param.h"
 
@@ -50 +48 @@
 
 #include "glmenu_imagescreen.h"
-
-
-
-
 
 
@@ -313 +307 @@
 {
   PRINT(0)("==================================================\n");
+
   Playable* playable;
-  const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
-  assert(playableList != NULL);
-  std::list<BaseObject*>::const_iterator entity;
-
-
-
-  for (entity = playableList->begin(); entity != playableList->end(); entity++)
-  {
-    Playable* p = dynamic_cast<Playable*>(*entity);
+
+  for (ObjectList<Playable>::const_iterator entity = Playable::objectList().begin();
+       entity != Playable::objectList().end();
+      ++entity)
+  {
+    Playable* p = *entity;
     PRINTF(0)("Got a playable, class: %s, name: %s, uid: %i\n", (*entity)->getClassCName(), (*entity)->getCName(), p->getUniqueID());
   }
@@ -329 +321 @@
   if( this->toggle)
   {
-    playable = dynamic_cast<Playable*>(playableList->front());
+    playable = Playable::objectList().front();
     this->localPlayer->setPlayable(playable);
     this->toggle = !this->toggle;
@@ -335 +327 @@
   else
   {
-    playable = dynamic_cast<Playable*>(playableList->back());
+    playable = Playable::objectList().back();
     this->localPlayer->setPlayable(playable);
     this->toggle = !this->toggle;