Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7220 in orxonox.OLD


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

orxonox/trunk: more strings

Location:
branches/std/src
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • branches/std/src/orxonox.h

    r7203 r7220  
    3232  Orxonox ();
    3333
    34   void parseIniFile(const char* fileName);
     34  void parseIniFile(const std::string& fileName);
    3535
    3636  int initResources ();

  • branches/std/src/util/track/track_manager.cc

    r7211 r7220  
    123123 * @returns The TrackElement if Found, NULL otherwise.
    124124*/
    125 TrackElement* TrackElement::findByName(const char* trackName)
     125TrackElement* TrackElement::findByName(const std::string& trackName)
    126126{
    127127  // return if Found.
    … …  
    532532 * @param trackName the Name of the Track to work on
    533533*/
    534 void TrackManager::workOnS(const char* trackName)
     534void TrackManager::workOnS(const std::string& trackName)
    535535{
    536536  TrackElement* tmpElem = this->firstTrackElem->findByName(trackName);
    … …  
    657657   @todo this must be better
    658658*/
    659 void TrackManager::setSavePointS(const char* nextElementName)
     659void TrackManager::setSavePointS(const std::string& nextElementName)
    660660{
    661661  this->setSavePoint(NULL);
    … …  
    725725  for(int i = 0; i < count; i++)
    726726    {
    727       this->firstTrackElem->findByID(trackIDs[i])->setName(va_arg(name, const char*));
     727      this->firstTrackElem->findByID(trackIDs[i])->setName(va_arg(name, const std::string&));
    728728    }
    729729  va_end(name);
    … …  
    734734   \see TrackManager::fork(unsigned int count, ...)
    735735*/
    736 void TrackManager::forkS(const char* forkString)
     736void TrackManager::forkS(const std::string& forkString)
    737737{
    738738  SubString strings(forkString, ',');
    … …  
    860860  for(int i = 0; i < count; i++)
    861861    {
    862       const char* name = va_arg (NAME, char*);
     862      const std::string& name = va_arg (NAME, char*);
    863863      TrackElement* tmpElem = this->firstTrackElem->findByName(name);
    864864      if (tmpElem)
    … …  
    875875   \see void TrackManager::join(unsigned int count, ...)
    876876*/
    877 void TrackManager::joinS(const char* joinString)
     877void TrackManager::joinS(const std::string& joinString)
    878878{
    879879  SubString strings(joinString, ',');

  • branches/std/src/util/track/track_manager.h

    r7216 r7220  
    4646
    4747  TrackElement* findByID(unsigned int trackID);
    48   TrackElement* findByName(const char* trackName);
     48  TrackElement* findByName(const std::string& trackName);
    4949  bool backLoopCheck() const;
    5050
    … …  
    153153  void addHotPoint(float x, float y, float z);
    154154  int addHotPointV(Vector newPoint, TrackElement* trackElem = NULL);
    155   void setSavePointS(const char* nextElementName);
     155  void setSavePointS(const std::string& nextElementName);
    156156  void setSavePoint(TrackElement* trackElem = NULL);
    157157  void fork(unsigned int count, ...);
    … …  
    162162  void condition(CONDITION cond, void* subject, TrackElement* trackElem = NULL);
    163163  void join(unsigned int count, ...);
    164   void joinS(const char* joinString);
     164  void joinS(const std::string& joinString);
    165165  void joinS(unsigned int cound, ...);
    166166  void joinV(unsigned int count, int* trackIDs);

  • 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.