Changeset 7203 in orxonox.OLD for branches/std/src/story_entities
- Timestamp:
- Mar 9, 2006, 5:28:10 PM (19 years ago)
- Location:
- branches/std/src/story_entities
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/std/src/story_entities/game_world.cc
r7193 r7203 145 145 GameLoader* loader = GameLoader::getInstance(); 146 146 147 if( getLoadFile() == NULL)147 if( getLoadFile().empty()) 148 148 { 149 149 PRINTF(1)("GameWorld has no path specified for loading\n"); … … 155 155 if( !XMLDoc->LoadFile()) 156 156 { 157 PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc->ErrorDesc(), this->getLoadFile() , XMLDoc->ErrorRow(), XMLDoc->ErrorCol());157 PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc->ErrorDesc(), this->getLoadFile().c_str(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol()); 158 158 delete XMLDoc; 159 159 return (ErrorMessage){213,"XML File parsing error","GameWorld::load()"}; -
branches/std/src/story_entities/game_world_data.cc
r7193 r7203 129 129 // load the parameters 130 130 // name 131 const char*string = grabParameter( root, "name");132 if( string == NULL)131 std::string string = grabParameter( root, "name"); 132 if( string.empty() ) 133 133 { 134 134 PRINTF(2)("GameWorld is missing a proper 'name'\n"); … … 136 136 } 137 137 else 138 this->setName(string );138 this->setName(string.c_str()); 139 139 140 140 this->loadGUI(root); … … 363 363 { 364 364 PRINTF(3)("Setting Sound Track to %s\n", name); 365 char* oggFile = ResourceManager::getFullName(name); /// FIXME365 std::string oggFile = ResourceManager::getFullName(name); 366 366 this->music = new OggPlayer(oggFile); 367 delete[] oggFile;368 367 369 368 //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL); -
branches/std/src/story_entities/story_entity.cc
r7193 r7203 40 40 this->isRunning = false; 41 41 42 this->loadFile = NULL;42 this->loadFile = ""; 43 43 this->storyID = -1; 44 44 this->description = NULL; … … 100 100 * @param name the name of the path 101 101 */ 102 void StoryEntity::setLoadFile(const char* fileName) 103 { 104 if (this->loadFile) 105 delete this->loadFile; 102 void StoryEntity::setLoadFile(const std::string& fileName) 103 { 106 104 if (ResourceManager::isFile(fileName)) 107 105 { 108 this->loadFile = new char[strlen(fileName)+1]; 109 strcpy(this->loadFile, fileName); 106 this->loadFile = fileName; 110 107 } 111 108 else … … 149 146 { 150 147 PRINTF(3)("Grabbing the Worlds Settings\n", this->getLoadFile()); 151 if( getLoadFile() == NULL)152 return;148 if( getLoadFile().empty()) 149 return; 153 150 TiXmlDocument XMLDoc(this->getLoadFile()); 154 151 // load the xml world file for further loading 155 152 if( !XMLDoc.LoadFile()) 156 153 { 157 PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc.ErrorDesc(), this->getLoadFile() , XMLDoc.ErrorRow(), XMLDoc.ErrorCol());154 PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc.ErrorDesc(), this->getLoadFile().c_str(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol()); 158 155 return; 159 156 } -
branches/std/src/story_entities/story_entity.h
r6993 r7203 61 61 inline int getStoryID() { return this->storyID; } 62 62 63 void setLoadFile( const char*fileName);63 void setLoadFile(const std::string& fileName); 64 64 /** @returns the Filename this StoryEntity was loaded with */ 65 const char*getLoadFile() const { return this->loadFile; }65 const std::string& getLoadFile() const { return this->loadFile; } 66 66 67 67 void setNextStoryID(int nextStoryID); … … 86 86 87 87 protected: 88 bool isInit; //!< if the entity is initialized, this has to be true.89 bool isRunning; //!< is true if the entity is running90 bool isPaused; //!< is true if the entity is paused88 bool isInit; //!< if the entity is initialized, this has to be true. 89 bool isRunning; //!< is true if the entity is running 90 bool isPaused; //!< is true if the entity is paused 91 91 92 92 93 93 private: 94 int storyID; //!< this is the number of this entity, identifying it in a list/tree...95 int nextStoryID; //!< if this entity has finished, this entity shall be called96 char*loadFile; //!< The file from which this world is loaded94 int storyID; //!< this is the number of this entity, identifying it in a list/tree... 95 int nextStoryID; //!< if this entity has finished, this entity shall be called 96 std::string loadFile; //!< The file from which this world is loaded 97 97 98 char* description; //!< the description of the StoryEntity99 char* menuItemImage; //!< the item image of the StoryEntity100 char* menuScreenshoot; //!< the screenshoot of the StoryEntity101 bool bMenuEntry; //!< If true, this GameWorld apears in the SimpleMenu: SimpleMenu specific98 char* description; //!< the description of the StoryEntity 99 char* menuItemImage; //!< the item image of the StoryEntity 100 char* menuScreenshoot; //!< the screenshoot of the StoryEntity 101 bool bMenuEntry; //!< If true, this GameWorld apears in the SimpleMenu: SimpleMenu specific 102 102 }; 103 103
Note: See TracChangeset
for help on using the changeset viewer.