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

Timestamp:

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

Author:

patrick

Message:

trunk: works again

Location:

trunk/src/world_entities

Files:

• image_entity.cc (modified) (1 diff)
• planet.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (2 diffs)

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;