Changeset 10428 in orxonox.OLD for trunk/src

Timestamp:

Jan 28, 2007, 1:35:33 AM (18 years ago)

Author:

patrick

Message:

added a script interface to game world for displaying txt

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (2 diffs)
• story_entities/game_world.h (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/cameraman.cc (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -65 +65 @@
 CREATE_SCRIPTABLE_CLASS(GameWorld,
                         addMethod("setPlaymode", Executor1<GameWorld, lua_State*,const std::string&>(&GameWorld::setPlaymode))
-                        ->addMethod("setSoundtrack", Executor1<GameWorld, lua_State*, const std::string&>(&GameWorld::setSoundtrack))
+                        ->addMethod("setSoundtrack", Executor1<GameWorld, lua_State*, const std::string&>(&GameWorld::showText))
+                        ->addMethod("showText", 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))
@@ -243 +244 @@
     this->dataTank->music->play();
   }
+}
+
+void GameWorld::showText(const std::string& text)
+{
+  if (this->dataTank->localPlayer != NULL)
+    this->dataTank->localPlayer->hud().notifyUser(text);
 }
 

trunk/src/story_entities/game_world.h

@@ -50 +50 @@
   virtual void run();
 
+  void showText(const std::string& text);
   void setPlaymode(Playable::Playmode playmode);
   void setPlaymode(const std::string& playmode);

trunk/src/story_entities/game_world_data.cc

@@ -416 +416 @@
     std::string oggFile = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(name);
     this->music = new OrxSound::OggPlayer(oggFile);
-    if (this->localPlayer != NULL)
-      this->localPlayer->hud().notifyUser(std::string("Playing SoundTrack: ") + this->music->artist() + " - " + this->music->title());
+//     if (this->localPlayer != NULL)
+//       this->localPlayer->hud().notifyUser(std::string("Playing SoundTrack: ") + this->music->artist() + " - " + this->music->title());
 
     //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);

trunk/src/world_entities/cameraman.cc

@@ -38 +38 @@
                         ->addMethod("detachCurrCamera", Executor0<CameraMan, lua_State*>(&CameraMan::detachCurrCamera))
                         ->addMethod("setCam", Executor1<CameraMan, lua_State*, const std::string&>(&CameraMan::setCam))
-                        ->addMethod("togglFade", Executor0<CameraMan, lua_State*>(&CameraMan::togglFade))
+                        ->addMethod("toggleFade", Executor0<CameraMan, lua_State*>(&CameraMan::togglFade))
                         ->addMethod("initFadeBlack", Executor0<CameraMan, lua_State*>(&CameraMan::initFadeBlack))
                         ->addMethod("getCurrCameraCoorX", Executor0ret<CameraMan, lua_State*,float>(&CameraMan::getCurrCameraCoorX))