Changeset 6988 in orxonox.OLD for trunk/src/story_entities
- Timestamp:
- Feb 2, 2006, 8:31:10 PM (19 years ago)
- Location:
- trunk/src/story_entities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/story_entities/game_world.cc
r6981 r6988 192 192 this->dataTank->unloadData(); 193 193 194 State::setCurrentStoryEntity(NULL); 194 195 if (this->dataXML) 195 196 delete this->dataXML; -
trunk/src/story_entities/game_world_data.cc
r6987 r6988 162 162 glmis->setBackgroundImage("pictures/load_screen.jpg"); 163 163 this->glmis->setMaximum(8); 164 // this->glmis->draw();164 // this->glmis->draw(); 165 165 } 166 166 else 167 167 { 168 168 this->glmis->loadParams(element); 169 // this->glmis->draw();169 // this->glmis->draw(); 170 170 } 171 171 this->glmis->draw(); … … 257 257 delete this->localPlayer; 258 258 259 260 261 262 263 //264 // nodeList = ClassList::getList(CL_ELEMENT_2D);265 // if (nodeList != NULL)266 // while (!nodeList->empty())267 // delete nodeList->front();259 nodeList = ClassList::getList(CL_GRAPHICS_EFFECT); 260 if (nodeList != NULL) 261 while (!nodeList->empty()) 262 delete nodeList->front(); 263 // 264 // nodeList = ClassList::getList(CL_ELEMENT_2D); 265 // if (nodeList != NULL) 266 // while (!nodeList->empty()) 267 // delete nodeList->front(); 268 268 269 269 … … 302 302 LoadParam(root, "Music", this, GameWorldData, setSoundTrack); 303 303 304 // LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);304 // LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams); 305 305 //LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams); 306 306 … … 343 343 { 344 344 PRINTF(3)("Setting Sound Track to %s\n", name); 345 this->music = (OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL); 346 } 347 } 348 349 345 char* oggFile = ResourceManager::getFullName(name); /// FIXME 346 this->music = new OggPlayer(oggFile); 347 delete[] oggFile; 348 349 //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL); 350 //assert(this->music->isA(CL_SOUND_OGG_PLAYER)); 351 } 352 } 353 354
Note: See TracChangeset
for help on using the changeset viewer.