Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7221 in orxonox.OLD for trunk/src/world_entities/space_ships


Ignore:
Timestamp:
Mar 15, 2006, 3:10:45 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

Location:
trunk/src/world_entities/space_ships
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/space_ships/helicopter.cc

    r7193 r7221  
    5555 * @param fileName the name of the File to load the helicopter from (absolute path)
    5656 */
    57 Helicopter::Helicopter(const char* fileName)
     57Helicopter::Helicopter(const std::string& fileName)
    5858{
    5959  this->init();
     
    6262  if(!doc.LoadFile())
    6363  {
    64     PRINTF(2)("Loading file %s failed for Helicopter.\n", fileName);
     64    PRINTF(2)("Loading file %s failed for Helicopter.\n", fileName.c_str());
    6565    return;
    6666  }
     
    110110  this->loadModel("models/ships/helicopter_#.obj", 1.0);
    111111
    112   EventHandler::getInstance()->grabEvents(true);
     112  //EventHandler::getInstance()->grabEvents(true);
    113113
    114114  bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
  • trunk/src/world_entities/space_ships/helicopter.h

    r7092 r7221  
    1717
    1818    Helicopter();
    19     Helicopter(const char* fileName);
     19    Helicopter(const std::string& fileName);
    2020    Helicopter(const TiXmlElement* root);
    2121    virtual ~Helicopter();
  • trunk/src/world_entities/space_ships/hover.cc

    r7193 r7221  
    4747 * @param fileName the name of the File to load the hover from (absolute path)
    4848 */
    49 Hover::Hover(const char* fileName)
     49Hover::Hover(const std::string& fileName)
    5050{
    5151  this->init();
     
    5454  if(!doc.LoadFile())
    5555  {
    56     PRINTF(2)("Loading file %s failed for Hover.\n", fileName);
     56    PRINTF(2)("Loading file %s failed for Hover.\n", fileName.c_str());
    5757    return;
    5858  }
  • trunk/src/world_entities/space_ships/hover.h

    r7092 r7221  
    1414  public:
    1515
    16     Hover(const char* fileName);
     16    Hover(const std::string& fileName);
    1717    Hover(const TiXmlElement* root = NULL);
    1818    virtual ~Hover();
  • trunk/src/world_entities/space_ships/space_ship.cc

    r7193 r7221  
    6969 * @param fileName the name of the File to load the spaceship from (absolute path)
    7070 */
    71 SpaceShip::SpaceShip(const char* fileName)
     71SpaceShip::SpaceShip(const std::string& fileName)
    7272{
    7373  this->init();
     
    7676  if(!doc.LoadFile())
    7777  {
    78     PRINTF(2)("Loading file %s failed for spaceship.\n", fileName);
     78    PRINTF(2)("Loading file %s failed for spaceship.\n", fileName.c_str());
    7979    return;
    8080  }
  • trunk/src/world_entities/space_ships/space_ship.h

    r7116 r7221  
    2121
    2222  public:
    23     SpaceShip(const char* fileName);
     23    SpaceShip(const std::string& fileName);
    2424    SpaceShip(const TiXmlElement* root = NULL);
    2525    virtual ~SpaceShip();
  • trunk/src/world_entities/space_ships/turbine_hover.cc

    r7193 r7221  
    4949 * @param fileName the name of the File to load the turbine_hover from (absolute path)
    5050 */
    51 TurbineHover::TurbineHover(const char* fileName)
     51TurbineHover::TurbineHover(const std::string& fileName)
    5252{
    5353  this->init();
     
    5656  if(!doc.LoadFile())
    5757  {
    58     PRINTF(2)("Loading file %s failed for TurbineHover.\n", fileName);
     58    PRINTF(2)("Loading file %s failed for TurbineHover.\n", fileName.c_str());
    5959    return;
    6060  }
  • trunk/src/world_entities/space_ships/turbine_hover.h

    r7092 r7221  
    1818  public:
    1919
    20     TurbineHover(const char* fileName);
     20    TurbineHover(const std::string& fileName);
    2121    TurbineHover(const TiXmlElement* root = NULL);
    2222    virtual ~TurbineHover();
Note: See TracChangeset for help on using the changeset viewer.