Changeset 7036 in orxonox.OLD for trunk/src

Timestamp:

Feb 5, 2006, 11:54:39 PM (19 years ago)

Author:

patrick

Message:

trunk: the game rules are now loadable

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (2 diffs)

trunk/src/Makefile.am

@@ -32 +32 @@
                 lib/graphics/effects/fog_effect.cc \
                 lib/graphics/effects/lense_flare.cc \
+                \
+                util/multiplayer_team_deathmatch.cc \
                 \
                 subprojects/benchmark.cc

trunk/src/story_entities/game_world_data.cc

@@ -15 +15 @@
 
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD
+
+#include <fstream>
+#include <iostream>
 
 #include "game_world_data.h"
@@ -365 +368 @@
 void GameWorldData::loadGameRule(const TiXmlElement* root)
 {
-
-  const TiXmlElement* element = root->FirstChildElement("GameRule");
-
-  if( element == NULL)
-  {
-    PRINTF(1)("GameWorld is missing 'GameRule'\n");
-  }
-  else
-  {
-    element = element->FirstChildElement();
-
-    while( element != NULL)
+  const TiXmlElement* element = root->FirstChildElement();
+  while( element != NULL)
+  {
+    PRINTF(4)("creating %s\n", element->Value());
+    BaseObject* created = Factory::fabricate(element);
+    if (created != NULL /*&& created->isA(CL_GAME_RULES)*/)
     {
-      BaseObject* created = Factory::fabricate(element);
-      if (created == NULL /*|| !created->isA(CL_GAME_RULE)*/)
-        delete created;
-      else
-      {
-        this->gameRule = dynamic_cast<GameRules*>(created);
-        element = element->NextSiblingElement();
-      }
+      this->gameRule = dynamic_cast<GameRules*>(created);
     }
-  }
-
-
-
-}
-
-
-
+    else
+    {
+      PRINTF(1)("Could not create a %s\n", element->Value());
+      delete created;
+    }
+    element = element->NextSiblingElement();
+  }
+}
+
+
+