Changeset 10319 in orxonox.OLD for trunk

Timestamp:

Jan 24, 2007, 2:04:05 AM (18 years ago)

Author:

patrick

Message:

injected silvans patch

Location:

trunk/src

Files:

• lib/script_engine/script.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (2 diffs)
• story_entities/story_entity.cc (modified) (1 diff)
• story_entities/story_entity.h (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (1 diff)

trunk/src/lib/script_engine/script.cc

@@ -129 +129 @@
    }
 
+   printf("SCRIPT : ERROR: while loading file %s \n",filename.c_str());
    return false;
  }

trunk/src/story_entities/game_world.cc

@@ -65 +65 @@
                         addMethod("setPlaymode", Executor1<GameWorld, lua_State*,const std::string&>(&GameWorld::setPlaymode))
                         ->addMethod("setSoundtrack", Executor1<GameWorld, lua_State*, const std::string&>(&GameWorld::setSoundtrack))
+                        ->addMethod("getStoryID", Executor0ret<StoryEntity, lua_State*, int>(&StoryEntity::getStoryID))
+                        ->addMethod("setNextStoryName", Executor1ret<StoryEntity, lua_State*, bool, const std::string&>(&StoryEntity::setNextStoryName))
+                        ->addMethod("stop", Executor0ret<GameWorld, lua_State*, bool>(&GameWorld::stop))
                        );
 
@@ -305 +308 @@
   if (this->dataTank->music != NULL)
     this->dataTank->music->play();
+
+  PNode::getNullParent()->updateNode(0.01);
+  PNode::getNullParent()->updateNode(0.01);
+
 
   while( this->bRunning) /* @todo implement pause */

trunk/src/story_entities/story_entity.cc

@@ -132 +132 @@
   this->nextStoryID = nextStoryID;
 }
+
+
+/**
+ * sets the id of the next story entity by name
+ * @param nextStoryName the story name of the next StoryEntity
+ */
+bool StoryEntity::setNextStoryName(const std::string& nextStoryName)
+{
+  for (ObjectList<StoryEntity>::const_iterator it = StoryEntity::objectList().begin();
+       it != StoryEntity::objectList().end();
+       ++it)
+    if( (*it)->getName().compare(nextStoryName) == 0)
+     {
+      this->setNextStoryID( (*it)->getStoryID() );
+      return true;
+     }
+
+     return false;
+}
+
 
 /**

trunk/src/story_entities/story_entity.h

@@ -67 +67 @@
   const std::string& getLoadFile() const { return this->loadFile; }
 
+  bool setNextStoryName(const std::string& nextStoryName);
   void setNextStoryID(int nextStoryID);
   /**  gets the story id of the current entity @returns story id */

trunk/src/world_entities/script_trigger.cc

@@ -63 +63 @@
   addToScript = false;
   this->activeOnCreation = false;
+  target = NULL;
 
   if(root != NULL)