Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6696 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Jan 25, 2006, 2:53:34 PM (19 years ago)
Author:
patrick
Message:

trunk: works again

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/story_entities/simple_game_menu.cc

    r6634 r6696  
    8282{
    8383  /* skip the GameWorld, since it does not define any useful loadParams for this class */
    84   static_cast<GameWorld*>(this)->loadParams(root);
     84  //static_cast<GameWorld*>(this)->loadParams(root);
     85  GameWorld::loadParams(root);
    8586
    8687  PRINTF(4)("Loaded SimpleGameMenu specific stuff\n");
  • trunk/src/story_entities/simple_game_menu.h

    r6634 r6696  
    3131    virtual ~SimpleGameMenu();
    3232
    33     void loadParams(const TiXmlElement* root);
     33    virtual void loadParams(const TiXmlElement* root);
    3434
    3535    virtual ErrorMessage init();
  • trunk/src/world_entities/image_entity.cc

    r6634 r6696  
    7979void ImageEntity::loadParams(const TiXmlElement* root)
    8080{
    81   static_cast<PNode*>(this)->loadParams(root);
     81  PNode::loadParams(root);
    8282
    8383  LoadParam(root, "texture", this, ImageEntity, setTexture)
  • trunk/src/world_entities/planet.cc

    r6695 r6696  
    7878void Planet::loadParams(const TiXmlElement* root)
    7979{
    80   static_cast<WorldEntity*>(this)->loadParams(root);
     80  WorldEntity::loadParams(root);
    8181
    8282  LoadParam(root, "texture", this, Planet, setTexture)
  • trunk/src/world_entities/space_ships/space_ship.cc

    r6695 r6696  
    130130  this->getWeaponManager()->changeWeaponConfig(1);
    131131
    132   EventHandler::getInstance()->grabEvents(true);
     132  //EventHandler::getInstance()->grabEvents(true);
    133133
    134134  bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
     
    140140  controlVelocityX = 25;
    141141  controlVelocityY = 150;
    142   shipInertia = 0.5             ;
     142  shipInertia = 0.5             ;
    143143//  cycle = 0.0;
    144144
Note: See TracChangeset for help on using the changeset viewer.