Changeset 9727 in orxonox.OLD for branches/new_class_id/src/story_entities

Timestamp:

Sep 14, 2006, 5:24:31 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: new Executor construct, that is much more typesafe, faster, and easier to extend…

Also changed the LoadParam process, and adapted ScriptEngine calls

Then at the end, some missing headers appeared, and appended them to all the cc-files again.

Location:

branches/new_class_id/src/story_entities

Files:

• campaign.cc (modified) (1 diff)
• campaign_data.cc (modified) (1 diff)
• game_world.cc (modified) (2 diffs)
• game_world_data.cc (modified) (2 diffs)
• single_player_world.cc (modified) (1 diff)
• story_entity.cc (modified) (2 diffs)

branches/new_class_id/src/story_entities/campaign.cc

@@ -24 +24 @@
 
 #include "campaign_data.h"
+#include "debug.h"
 
 

branches/new_class_id/src/story_entities/campaign_data.cc

@@ -18 +18 @@
 
 #include "util/loading/factory.h"
-#include "util/loading/load_param.h"
+#include "util/loading/load_param_xml.h"
 
 #include "story_entity.h"
 
+#include "debug.h"
 
 

branches/new_class_id/src/story_entities/game_world.cc

@@ -38 +38 @@
 
 #include "util/loading/factory.h"
-#include "util/loading/load_param.h"
+#include "util/loading/load_param_xml.h"
 #include "loading/fast_factory.h"
 #include "shell_command.h"
@@ -415 +415 @@
     if (currentFrame - this->lastFrame < .01)
     {
-      SDL_Delay((int)1000.0 * (0.01 - (currentFrame - lastFrame)));
+      SDL_Delay((int)(1000.0 * (0.01 - (currentFrame - lastFrame))));
       currentFrame = Timer::getNow();
     }

branches/new_class_id/src/story_entities/game_world_data.cc

@@ -41 +41 @@
 #include "util/loading/factory.h"
 #include "loading/fast_factory.h"
-#include "util/loading/load_param.h"
+#include "util/loading/load_param_xml.h"
 
 #include "graphics_engine.h"
@@ -193 +193 @@
 ErrorMessage GameWorldData::loadWorldEntities(const TiXmlElement* root)
 {
-
   const TiXmlElement* element = root->FirstChildElement("WorldEntities");
   bool mouseCaptured = EventHandler::getInstance()->grabbedEvents();

branches/new_class_id/src/story_entities/single_player_world.cc

@@ -20 +20 @@
 
 #include "state.h"
+#include "debug.h"
 
 #include "util/loading/load_param.h"

branches/new_class_id/src/story_entities/story_entity.cc

@@ -25 +25 @@
 #include "util/loading/resource_manager.h"
 
-
+#include "debug.h"
 
 ObjectListDefinition(StoryEntity);
@@ -102 +102 @@
 void StoryEntity::setLoadFile(const std::string& fileName)
 {
+  printf("===Testing %s:: %s\n", this->getCName(), fileName.c_str());
   if (File(fileName).isFile())
   {