Changeset 6532 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 18, 2006, 1:20:02 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/movie_play to the trunk. no conflicts, but a minor virtual function BUG

Location:

trunk/src/world_entities

Files:

• Makefile.am (modified) (2 diffs)
• movie_entity.cc (copied) (copied from branches/avi_play/src/world_entities/movie_entity.cc) (2 diffs)
• movie_entity.h (copied) (copied from branches/avi_play/src/world_entities/movie_entity.h) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)

trunk/src/world_entities/Makefile.am

@@ -20 +20 @@
                   world_entities/terrain.cc \
                   world_entities/satellite.cc \
+                  world_entities/movie_entity.cc \
                   world_entities/character_attributes.cc \
                   world_entities/test_entity.cc \
@@ -68 +69 @@
                  world_entities/terrain.h \
                  world_entities/satellite.h \
+                 world_entities/movie_entity.h \
                  world_entities/character_attributes.h \
                  world_entities/test_entity.h \

trunk/src/world_entities/movie_entity.cc

@@ -65 +65 @@
 void MovieEntity::loadParams(const TiXmlElement* root)
 {
-  static_cast<WorldEntity*>(this)->loadParams(root);
+  WorldEntity::loadParams(root);
 
   LoadParam(root, "name", this, MovieEntity, loadMovie);
@@ -107 +107 @@
   if(counter != fps * timer)
   {
-    counter = fps * timer;
+    counter = (int)(fps * timer);
 
     if (counter >= media_container->getFrameCount())

trunk/src/world_entities/movie_entity.h

@@ -35 +35 @@
     virtual void tick (float time);
 
-    void loadParams(const TiXmlElement* root);
+    virtual void loadParams(const TiXmlElement* root);
 
     void loadMovie(const char* filename);

trunk/src/world_entities/space_ships/space_ship.cc

@@ -123 +123 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(true);
+  //EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;