Changeset 7022 in orxonox.OLD for trunk/src

Timestamp:

Feb 3, 2006, 5:17:21 PM (19 years ago)

Author:

bensch

Message:

merge

Location:

trunk/src/story_entities

Files:

• movie_loader.cc (modified) (4 diffs)
• movie_loader.h (modified) (2 diffs)

trunk/src/story_entities/movie_loader.cc

@@ -18 +18 @@
 #include "movie_player.h"
 #include "factory.h"
+#include "event_handler.h"
 #include "graphics_engine.h"
 #include "load_param.h"
@@ -67 +68 @@
 
 
-ErrorMessage MovieLoader::unloadData() {}
+ErrorMessage MovieLoader::unloadData()
+{
+  EventHandler::getInstance()->unsubscribe(this, ES_GAME);
+}
 
 bool MovieLoader::start()
 {
+  EventHandler::getInstance()->pushState(ES_GAME);
+
   this->movie_player->start(0);
   
@@ -79 +85 @@
 bool MovieLoader::stop()
 {
+  EventHandler::getInstance()->popState();
+
   this->isRunning = false;
 }
@@ -92 +100 @@
   while( this->isRunning)
   {
+    EventHandler::getInstance()->process();
     this->tick();
     this->draw();
   }
 }
+
+void MovieLoader::process(const Event &event) {}
 
 void MovieLoader::draw() const

trunk/src/story_entities/movie_loader.h

@@ -9 +9 @@
 
 #include "story_entity.h"
+#include "event_listener.h"
 
 class MoviePlayer;
 
-class MovieLoader : public StoryEntity
+class MovieLoader : public StoryEntity, virtual public EventListener
 {
   private:
@@ -39 +40 @@
     virtual void run();
 
+    virtual void process(const Event &event);
+
   private:
     void loadMovie(const char* filename);