Changeset 6696 in orxonox.OLD

Timestamp:

Jan 25, 2006, 2:53:34 PM (18 years ago)

Author:

patrick

Message:

trunk: works again

Location:

trunk/src

Files:

• story_entities/simple_game_menu.cc (modified) (1 diff)
• story_entities/simple_game_menu.h (modified) (1 diff)
• world_entities/image_entity.cc (modified) (1 diff)
• world_entities/planet.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)

trunk/src/story_entities/simple_game_menu.cc

@@ -82 +82 @@
 {
   /* skip the GameWorld, since it does not define any useful loadParams for this class */
-  static_cast<GameWorld*>(this)->loadParams(root);
+  //static_cast<GameWorld*>(this)->loadParams(root);
+  GameWorld::loadParams(root);
 
   PRINTF(4)("Loaded SimpleGameMenu specific stuff\n");

trunk/src/story_entities/simple_game_menu.h

@@ -31 +31 @@
     virtual ~SimpleGameMenu();
 
-    void loadParams(const TiXmlElement* root);
+    virtual void loadParams(const TiXmlElement* root);
 
     virtual ErrorMessage init();

trunk/src/world_entities/image_entity.cc

@@ -79 +79 @@
 void ImageEntity::loadParams(const TiXmlElement* root)
 {
-  static_cast<PNode*>(this)->loadParams(root);
+  PNode::loadParams(root);
 
   LoadParam(root, "texture", this, ImageEntity, setTexture)

trunk/src/world_entities/planet.cc

@@ -78 +78 @@
 void Planet::loadParams(const TiXmlElement* root)
 {
-  static_cast<WorldEntity*>(this)->loadParams(root);
+  WorldEntity::loadParams(root);
 
   LoadParam(root, "texture", this, Planet, setTexture)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -130 +130 @@
   this->getWeaponManager()->changeWeaponConfig(1);
 
-  EventHandler::getInstance()->grabEvents(true);
+  //EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -140 +140 @@
   controlVelocityX = 25;
   controlVelocityY = 150;
-  shipInertia = 0.5             ;
+  shipInertia = 0.5             ;
 //  cycle = 0.0;