Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7220 in orxonox.OLD for branches/std/src/world_entities


Ignore:
Timestamp:
Mar 12, 2006, 6:38:41 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: more strings

Location:
branches/std/src/world_entities
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/std/src/world_entities/creatures/md2_creature.cc

    r7217 r7220  
    5252 * @param fileName the name of the File to load the MD2Creature from (absolute path)
    5353 */
    54 MD2Creature::MD2Creature(const char* fileName)
     54MD2Creature::MD2Creature(const std::string& fileName)
    5555{
    5656  this->init();
    … …  
    5959  if(!doc.LoadFile())
    6060  {
    61     PRINTF(2)("Loading file %s failed for md2 creature.\n", fileName);
     61    PRINTF(2)("Loading file %s failed for md2 creature.\n", fileName.c_str());
    6262    return;
    6363  }

  • branches/std/src/world_entities/creatures/md2_creature.h

    r7092 r7220  
    1919  public:
    2020
    21     MD2Creature(const char* fileName);
     21    MD2Creature(const std::string& fileName);
    2222    MD2Creature(const TiXmlElement* root = NULL);
    2323    virtual ~MD2Creature();

  • branches/std/src/world_entities/space_ships/helicopter.cc

    r7207 r7220  
    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  }

  • branches/std/src/world_entities/space_ships/helicopter.h

    r7092 r7220  
    1717
    1818    Helicopter();
    19     Helicopter(const char* fileName);
     19    Helicopter(const std::string& fileName);
    2020    Helicopter(const TiXmlElement* root);
    2121    virtual ~Helicopter();

  • branches/std/src/world_entities/space_ships/hover.cc

    r7193 r7220  
    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  }

  • branches/std/src/world_entities/space_ships/hover.h

    r7092 r7220  
    1414  public:
    1515
    16     Hover(const char* fileName);
     16    Hover(const std::string& fileName);
    1717    Hover(const TiXmlElement* root = NULL);
    1818    virtual ~Hover();

  • branches/std/src/world_entities/space_ships/space_ship.cc

    r7193 r7220  
    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  }

  • branches/std/src/world_entities/space_ships/space_ship.h

    r7116 r7220  
    2121
    2222  public:
    23     SpaceShip(const char* fileName);
     23    SpaceShip(const std::string& fileName);
    2424    SpaceShip(const TiXmlElement* root = NULL);
    2525    virtual ~SpaceShip();

  • branches/std/src/world_entities/space_ships/turbine_hover.cc

    r7193 r7220  
    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  }

  • branches/std/src/world_entities/space_ships/turbine_hover.h

    r7092 r7220  
    1818  public:
    1919
    20     TurbineHover(const char* fileName);
     20    TurbineHover(const std::string& fileName);
    2121    TurbineHover(const TiXmlElement* root = NULL);
    2222    virtual ~TurbineHover();

  • branches/std/src/world_entities/terrain.cc

    r7217 r7220  
    5959   this either loads out of an OBJ-file, or loads a heightmap if no .obj-extension is found.
    6060*/
    61 Terrain::Terrain(const char* fileName)
     61Terrain::Terrain(const std::string& fileName)
    6262{
    6363  this->init();
    6464
    65   if (!strstr(fileName, ".obj") || !strstr(fileName, ".OBJ") )
     65  if (fileName.rfind(".obj" ) != -1 || fileName.rfind(".OBJ") != -1 )
    6666  {
    6767    this->loadModel(fileName);

  • branches/std/src/world_entities/terrain.h

    r7216 r7220  
    2929 public:
    3030  Terrain(const TiXmlElement* root = NULL);
    31   Terrain(const char* fileName);
     31  Terrain(const std::string& fileName);
    3232  Terrain(DebugTerrain debugTerrain);
    3333  virtual ~Terrain();
Note: See TracChangeset for help on using the changeset viewer.