- Timestamp:
- Apr 26, 2006, 1:31:01 AM (19 years ago)
- Location:
- trunk/src
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/collision_detection/cd_engine.cc
r6316 r7370 106 106 //} 107 107 108 void CDEngine::checkCollisions( std::list<WorldEntity*>& list1, std::list<WorldEntity*>& list2)108 void CDEngine::checkCollisions(ObjectManager::EntityList& list1, ObjectManager::EntityList& list2) 109 109 { 110 110 BVTree* tree; 111 std::list<WorldEntity*>::iterator entity1, entity2, pre1, pre2;111 ObjectManager::EntityList::iterator entity1, entity2, pre1, pre2; 112 112 PRINTF(3)("checking for collisions\n"); 113 113 … … 195 195 196 196 197 void CDEngine::drawBV(const std::list<WorldEntity*>& drawList ) const198 { 199 std::list<WorldEntity*>::const_iterator entity;197 void CDEngine::drawBV(const ObjectManager::EntityList& drawList ) const 198 { 199 ObjectManager::EntityList::const_iterator entity; 200 200 for (entity = drawList.begin(); entity != drawList.end(); entity++) 201 201 if ((*entity)->isVisible()) -
trunk/src/lib/data/data_tank.h
r6424 r7370 25 25 virtual ErrorMessage init() {} 26 26 /** loads the data into the DataTank @param root is the xml root parameter for for loadParams() connection */ 27 virtual ErrorMessage loadData( TiXmlElement* root = NULL) {}27 virtual ErrorMessage loadData(const TiXmlElement* root = NULL) {} 28 28 /** unloads the data again from the DataTank */ 29 29 virtual ErrorMessage unloadData() {} -
trunk/src/lib/graphics/graphics_engine.cc
r7319 r7370 584 584 dynamic_cast<GraphicsEffect*>(*it)->draw(); 585 585 } 586 }587 588 void GraphicsEngine::draw(const std::list<WorldEntity*>& drawList ) const589 {590 std::list<WorldEntity*>::const_iterator entity;591 for (entity = drawList.begin(); entity != drawList.end(); entity++)592 if ((*entity)->isVisible())593 (*entity)->draw();594 586 } 595 587 -
trunk/src/lib/graphics/graphics_engine.h
r7256 r7370 69 69 void tick(float dt); 70 70 void draw() const; 71 void draw(const std::list<WorldEntity*>& drawList) const;72 71 void displayFPS(bool display); 73 72 -
trunk/src/story_entities/campaign_data.cc
r7193 r7370 56 56 57 57 /** 58 * loads the Parameters of a Campaign58 * @brief loads the Parameters of a Campaign 59 59 * @param root: The XML-element to load from 60 60 */ 61 61 void CampaignData::loadParams(const TiXmlElement* root) 62 62 { 63 LoadParamXML(root, "WorldList", this, CampaignData, loadData )63 LoadParamXML(root, "WorldList", this, CampaignData, loadDataDyn) 64 64 .describe("A List of Worlds to be loaded in this Campaign"); 65 65 } … … 67 67 68 68 /** 69 * loads a WorldList69 * @brief loads a WorldList 70 70 * @param root: the XML-element to load from 71 71 */ 72 void CampaignData::loadData (const TiXmlElement* root)72 void CampaignData::loadDataDyn(const TiXmlElement* root) 73 73 { 74 74 if( root == NULL) -
trunk/src/story_entities/campaign_data.h
r6874 r7370 17 17 { 18 18 19 20 21 19 public: 20 CampaignData(const TiXmlElement* root); 21 virtual ~CampaignData(); 22 22 23 23 virtual void loadParams(const TiXmlElement* root); 24 24 25 void loadData(const TiXmlElement* root);25 void addStoryEntity(StoryEntity* se); 26 26 27 void addStoryEntity(StoryEntity* se); 27 StoryEntity* getFirstLevel(); 28 StoryEntity* getNextLevel(); 29 StoryEntity* getLevel(int storyID); 28 30 29 StoryEntity* getFirstLevel(); 30 StoryEntity* getNextLevel(); 31 StoryEntity* getLevel(int storyID); 31 /** @param storyEntity the current entity to be set */ 32 inline void setCurrentEntity(StoryEntity* storyEntity) { this->currentEntity = storyEntity; } 33 /** @return the current StoryEntity played*/ 34 inline StoryEntity* getCurrentEntity() { return this->currentEntity; } 32 35 33 /** @param storyEntity the current entity to be set */ 34 inline void setCurrentEntity(StoryEntity* storyEntity) { this->currentEntity = storyEntity; } 35 /** @return the current StoryEntity played*/ 36 inline StoryEntity* getCurrentEntity() { return this->currentEntity; } 36 private: 37 void loadDataDyn(const TiXmlElement* root); 37 38 38 39 private: 40 StoryEntity* currentEntity; //!< reference to the currently used StoryEntity 41 std::list<StoryEntity*> storyEntities; //!< list of story entities 39 private: 40 StoryEntity* currentEntity; //!< reference to the currently used StoryEntity 41 std::list<StoryEntity*> storyEntities; //!< list of story entities 42 42 }; 43 43 -
trunk/src/story_entities/game_world.cc
r7369 r7370 184 184 { 185 185 PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n"); 186 delete this->shell; 186 187 187 188 this->dataTank->unloadData(); 188 189 189 delete this->shell;190 190 this->shell = NULL; 191 191 delete AnimationPlayer::getInstance(); … … 322 322 323 323 /** 324 * ticks a WorldEntity list324 * @brief ticks a WorldEntity list 325 325 * @param entityList list of the WorldEntities 326 326 * @param dt time passed since last frame 327 327 */ 328 void GameWorld::tick( std::list<WorldEntity*>entityList, float dt)329 { 330 std::list<WorldEntity*>::iterator entity, next;328 void GameWorld::tick(ObjectManager::EntityList entityList, float dt) 329 { 330 ObjectManager::EntityList::iterator entity, next; 331 331 next = entityList.begin(); 332 332 while (next != entityList.end()) … … 367 367 368 368 // TICK everything 369 this->tick(this->dataTank->objectManager->getObjectList(OM_DEAD_TICK), this->dtS); 370 this->tick(this->dataTank->objectManager->getObjectList(OM_ENVIRON), this->dtS); 371 this->tick(this->dataTank->objectManager->getObjectList(OM_COMMON), this->dtS); 372 this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_00), this->dtS); 373 this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ), this->dtS); 374 this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_01), this->dtS); 375 this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ), this->dtS); 369 for (i = 0; i < this->dataTank->tickLists.size(); ++i) 370 this->tick(this->dataTank->objectManager->getObjectList(this->dataTank->tickLists[i]), this->dtS); 376 371 377 372 /* update tick the rest */ … … 439 434 440 435 /** 441 * runs through all entities calling their draw() methods 436 * @brief draws all entities in the list drawList 437 * @param drawList the List of entities to draw. 438 */ 439 void GameWorld::drawEntityList(const ObjectManager::EntityList& drawList) const 440 { 441 ObjectManager::EntityList::const_iterator entity; 442 for (entity = drawList.begin(); entity != drawList.end(); entity++) 443 if ((*entity)->isVisible()) 444 (*entity)->draw(); 445 } 446 447 /** 448 * @brief runs through all entities calling their draw() methods 442 449 */ 443 450 void GameWorld::draw () … … 451 458 452 459 /* draw all WorldEntiy groups */ 453 engine->draw(State::getObjectManager()->getObjectList(OM_ENVIRON_NOTICK)); 454 engine->draw(State::getObjectManager()->getObjectList(OM_ENVIRON)); 455 engine->draw(State::getObjectManager()->getObjectList(OM_COMMON)); 456 engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_00)); 457 engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_00_PROJ)); 458 engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_01)); 459 engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ)); 460 for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i) 461 this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i])); 460 462 461 463 … … 463 465 { 464 466 CDEngine* engine = CDEngine::getInstance(); 465 engine->drawBV(State::getObjectManager()->getObjectList(OM_ENVIRON_NOTICK)); 466 engine->drawBV(State::getObjectManager()->getObjectList(OM_ENVIRON)); 467 engine->drawBV(State::getObjectManager()->getObjectList(OM_COMMON)); 468 engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_00)); 469 engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_01)); 470 engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ)); 467 for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i) 468 engine->drawBV(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i])); 471 469 } 472 470 -
trunk/src/story_entities/game_world.h
r7368 r7370 63 63 virtual void synchronize(); 64 64 virtual void handleInput(); 65 virtual void tick( std::list<WorldEntity*>worldEntity, float dt);65 virtual void tick(ObjectManager::EntityList worldEntity, float dt); 66 66 virtual void tick(); 67 67 virtual void update(); 68 68 virtual void collide(); 69 70 void drawEntityList(const ObjectManager::EntityList& drawList ) const; 69 71 virtual void draw(); 70 72 virtual void display(); -
trunk/src/story_entities/game_world_data.cc
r7369 r7370 114 114 * @param root reference to the xml root element 115 115 */ 116 ErrorMessage GameWorldData::loadData( TiXmlElement* root)116 ErrorMessage GameWorldData::loadData(const TiXmlElement* root) 117 117 { 118 118 // load the parameters … … 145 145 146 146 /** 147 * loads the GUI data147 * @brief loads the GUI data 148 148 * @param root reference to the xml root element 149 149 */ 150 ErrorMessage GameWorldData::loadGUI( TiXmlElement* root)151 { 152 TiXmlElement* element = root->FirstChildElement("LoadScreen");150 ErrorMessage GameWorldData::loadGUI(const TiXmlElement* root) 151 { 152 const TiXmlElement* element = root->FirstChildElement("LoadScreen"); 153 153 if( element == NULL) 154 154 { … … 169 169 170 170 /** 171 * unloads the GUI data171 * @brief unloads the GUI data 172 172 */ 173 173 ErrorMessage GameWorldData::unloadGUI() … … 178 178 179 179 /** 180 * loads the world entities from the xml file180 * @brief loads the world entities from the xml file 181 181 * @param root reference to the xml root parameter 182 182 */ 183 ErrorMessage GameWorldData::loadWorldEntities( TiXmlElement* root)184 { 185 TiXmlElement* element = root->FirstChildElement("WorldEntities");183 ErrorMessage GameWorldData::loadWorldEntities(const TiXmlElement* root) 184 { 185 const TiXmlElement* element = root->FirstChildElement("WorldEntities"); 186 186 187 187 if( element == NULL) … … 201 201 202 202 //todo do this more elegant 203 if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox"))203 if( element->Value() == "SkyBox" && created->isA(CL_SKYBOX)) 204 204 { 205 205 this->sky = dynamic_cast<WorldEntity*>(created); 206 206 State::setSkyBox(dynamic_cast<SkyBox*>(this->sky)); 207 207 } 208 if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))208 if( element->Value() == "Terrain" && created->isA(CL_TERRAIN)) 209 209 { 210 210 this->terrain = dynamic_cast<Terrain*>(created); … … 223 223 Playable* playable; 224 224 const list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE); 225 if (playableList != NULL) 226 { 225 if (playableList != NULL && !playableList->empty()) 226 { 227 /// TODO Make this also loadable 227 228 playable = dynamic_cast<Playable*>(playableList->front()); 228 229 this->localPlayer->setPlayable(playable); 229 230 } 231 232 // Fill the EntityLists. Tick then Draw: 233 this->tickLists.push_back(OM_DEAD_TICK); 234 this->tickLists.push_back(OM_ENVIRON); 235 this->tickLists.push_back(OM_COMMON); 236 this->tickLists.push_back(OM_GROUP_00); 237 this->tickLists.push_back(OM_GROUP_00_PROJ); 238 this->tickLists.push_back(OM_GROUP_01); 239 this->tickLists.push_back(OM_GROUP_01_PROJ); 240 241 this->drawLists.push_back(OM_ENVIRON_NOTICK); 242 this->drawLists.push_back(OM_ENVIRON); 243 this->drawLists.push_back(OM_COMMON); 244 this->drawLists.push_back(OM_GROUP_00); 245 this->drawLists.push_back(OM_GROUP_00_PROJ); 246 this->drawLists.push_back(OM_GROUP_01); 247 this->drawLists.push_back(OM_GROUP_01_PROJ); 230 248 231 249 /* init the pnode tree */ … … 248 266 if (nodeList != NULL) 249 267 while (!nodeList->empty()) 250 {251 // ClassList::debug( 3, CL_PARENT_NODE);252 // PNode::getNullParent()->debugNode(0);253 // printf("%s::%s\n", nodeList->front()->getClassName(), nodeList->front()->getName());254 delete nodeList->front();255 }268 { 269 // ClassList::debug( 3, CL_PARENT_NODE); 270 // PNode::getNullParent()->debugNode(0); 271 // printf("%s::%s\n", nodeList->front()->getClassName(), nodeList->front()->getName()); 272 delete nodeList->front(); 273 } 256 274 /* remove the player object */ 257 275 if( this->localPlayer) … … 271 289 272 290 nodeList = ClassList::getList(CL_ELEMENT_2D); 273 if (nodeList != NULL) 274 while (!nodeList->empty()) 275 delete nodeList->front(); 276 277 278 279 280 // unload the resources !! 291 if (nodeList != NULL) 292 while (!nodeList->empty()) 293 delete nodeList->front(); 294 295 // At this Point all the WorldEntites should be unloaded. 296 this->tickLists.clear(); 297 this->drawLists.clear(); 298 299 // unload the resources loaded in this Level !! 281 300 ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL); 282 301 … … 296 315 297 316 /** 298 * loads the scene data317 * @brief loads the scene data 299 318 * @param root reference to the xml root element 300 319 */ 301 ErrorMessage GameWorldData::loadScene( TiXmlElement* root)320 ErrorMessage GameWorldData::loadScene(const TiXmlElement* root) 302 321 { 303 322 LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams); -
trunk/src/story_entities/game_world_data.h
r7369 r7370 35 35 36 36 virtual ErrorMessage init(); 37 virtual ErrorMessage loadData( TiXmlElement* root);37 virtual ErrorMessage loadData(const TiXmlElement* root); 38 38 virtual ErrorMessage unloadData(); 39 39 … … 43 43 44 44 protected: 45 virtual ErrorMessage loadGUI( TiXmlElement* root);46 virtual ErrorMessage loadWorldEntities( TiXmlElement* root);47 virtual ErrorMessage loadScene( TiXmlElement* root);45 virtual ErrorMessage loadGUI(const TiXmlElement* root); 46 virtual ErrorMessage loadWorldEntities(const TiXmlElement* root); 47 virtual ErrorMessage loadScene(const TiXmlElement* root); 48 48 49 49 virtual ErrorMessage unloadGUI(); … … 64 64 GameRules* gameRule; //!< Reference to the game rules of this game 65 65 66 std:: list<OM_LIST>tickLists; //!< The Lists in the GameWorld that should be ticked.67 std:: list<OM_LIST>drawLists; //!< The Lists in the GameWorld, that should be drawn.66 std::vector<OM_LIST> tickLists; //!< The Lists in the GameWorld that should be ticked. 67 std::vector<OM_LIST> drawLists; //!< The Lists in the GameWorld, that should be drawn. 68 68 }; 69 69 -
trunk/src/story_entities/multi_player_world_data.cc
r7346 r7370 85 85 * @param root reference to the xml root element 86 86 */ 87 ErrorMessage MultiPlayerWorldData::loadGUI( TiXmlElement* root)87 ErrorMessage MultiPlayerWorldData::loadGUI(const TiXmlElement* root) 88 88 { 89 89 /* call underlying function */ … … 106 106 * @param root reference to the xml root parameter 107 107 */ 108 ErrorMessage MultiPlayerWorldData::loadWorldEntities( TiXmlElement* root)108 ErrorMessage MultiPlayerWorldData::loadWorldEntities(const TiXmlElement* root) 109 109 { 110 110 /* load the spawning points */ 111 TiXmlElement* element = root->FirstChildElement("SpawningPoints");111 const TiXmlElement* element = root->FirstChildElement("SpawningPoints"); 112 112 if( element == NULL) 113 113 { … … 244 244 * @param root reference to the xml root element 245 245 */ 246 ErrorMessage MultiPlayerWorldData::loadScene( TiXmlElement* root)246 ErrorMessage MultiPlayerWorldData::loadScene(const TiXmlElement* root) 247 247 { 248 248 /* call underlying function */ -
trunk/src/story_entities/multi_player_world_data.h
r6498 r7370 28 28 29 29 protected: 30 virtual ErrorMessage loadGUI( TiXmlElement* root);31 virtual ErrorMessage loadWorldEntities( TiXmlElement* root);32 virtual ErrorMessage loadScene( TiXmlElement* root);30 virtual ErrorMessage loadGUI(const TiXmlElement* root); 31 virtual ErrorMessage loadWorldEntities(const TiXmlElement* root); 32 virtual ErrorMessage loadScene(const TiXmlElement* root); 33 33 34 34 virtual ErrorMessage unloadGUI(); -
trunk/src/story_entities/simple_game_menu.cc
r7324 r7370 253 253 ErrorMessage SimpleGameMenu::unloadData() 254 254 { 255 256 255 EventHandler::getInstance()->unsubscribe(this, ES_MENU); 257 256 … … 316 315 317 316 /** 318 * no collision detection in the menu317 * @brief no collision detection in the menu 319 318 */ 320 319 void SimpleGameMenu::collide() … … 325 324 326 325 /** 327 * animate the scene326 * @brief animate the scene 328 327 */ 329 328 void SimpleGameMenu::animateScene(float dt) … … 337 336 338 337 /** 339 * event dispatcher funciton338 * @brief event dispatcher funciton 340 339 * @param event the incoming event 341 340 */ … … 515 514 * @param root reference to the xml root element 516 515 */ 517 ErrorMessage SimpleGameMenuData::loadGUI( TiXmlElement* root)516 ErrorMessage SimpleGameMenuData::loadGUI(const TiXmlElement* root) 518 517 { 519 518 /* call underlying function */ … … 536 535 * @param root reference to the xml root parameter 537 536 */ 538 ErrorMessage SimpleGameMenuData::loadWorldEntities(TiXmlElement* root) 539 { 540 TiXmlElement* element = root->FirstChildElement("WorldEntities"); 537 ErrorMessage SimpleGameMenuData::loadWorldEntities(const TiXmlElement* root) 538 { 539 GameWorldData::loadWorldEntities(root); 540 /* 541 const TiXmlElement* element = root->FirstChildElement("WorldEntities"); 541 542 542 543 if( element != NULL) … … 544 545 element = element->FirstChildElement(); 545 546 PRINTF(4)("Loading WorldEntities\n"); 546 while( 547 while(element != NULL) 547 548 { 548 549 BaseObject* created = Factory::fabricate(element); … … 550 551 printf("Created a %s: %s\n", created->getClassName(), created->getName()); 551 552 552 if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox"))553 if( element->Value() == "SkyBox") 553 554 this->sky = dynamic_cast<WorldEntity*>(created); 554 if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))555 if( element->Value() == "Terrain") 555 556 this->terrain = dynamic_cast<Terrain*>(created); 556 557 element = element->NextSiblingElement(); 557 558 } 559 558 560 PRINTF(4)("Done loading WorldEntities\n"); 559 561 } 560 562 561 / * init the pnode tree */563 // init the pnode tree 562 564 PNode::getNullParent()->init(); 565 */ 563 566 } 564 567 … … 578 581 * @param root reference to the xml root element 579 582 */ 580 ErrorMessage SimpleGameMenuData::loadScene( TiXmlElement* root)583 ErrorMessage SimpleGameMenuData::loadScene(const TiXmlElement* root) 581 584 { 582 585 /* call underlying function */ -
trunk/src/story_entities/simple_game_menu.h
r7318 r7370 106 106 107 107 protected: 108 virtual ErrorMessage loadGUI( TiXmlElement* root);109 virtual ErrorMessage loadWorldEntities( TiXmlElement* root);110 virtual ErrorMessage loadScene( TiXmlElement* root);108 virtual ErrorMessage loadGUI(const TiXmlElement* root); 109 virtual ErrorMessage loadWorldEntities(const TiXmlElement* root); 110 virtual ErrorMessage loadScene(const TiXmlElement* root); 111 111 112 112 virtual ErrorMessage unloadGUI(); -
trunk/src/story_entities/single_player_world_data.cc
r7193 r7370 53 53 * @param root reference to the xml root element 54 54 */ 55 ErrorMessage SinglePlayerWorldData::loadGUI( TiXmlElement* root)55 ErrorMessage SinglePlayerWorldData::loadGUI(const TiXmlElement* root) 56 56 { 57 57 /* call underlying function */ … … 74 74 * @param root reference to the xml root parameter 75 75 */ 76 ErrorMessage SinglePlayerWorldData::loadWorldEntities( TiXmlElement* root)76 ErrorMessage SinglePlayerWorldData::loadWorldEntities(const TiXmlElement* root) 77 77 { 78 78 /* call underlying function */ … … 95 95 * @param root reference to the xml root element 96 96 */ 97 ErrorMessage SinglePlayerWorldData::loadScene( TiXmlElement* root)97 ErrorMessage SinglePlayerWorldData::loadScene(const TiXmlElement* root) 98 98 { 99 99 /* call underlying function */ -
trunk/src/story_entities/single_player_world_data.h
r6424 r7370 26 26 27 27 protected: 28 virtual ErrorMessage loadGUI( TiXmlElement* root);29 virtual ErrorMessage loadWorldEntities( TiXmlElement* root);30 virtual ErrorMessage loadScene( TiXmlElement* root);28 virtual ErrorMessage loadGUI(const TiXmlElement* root); 29 virtual ErrorMessage loadWorldEntities(const TiXmlElement* root); 30 virtual ErrorMessage loadScene(const TiXmlElement* root); 31 31 32 32 virtual ErrorMessage unloadGUI(); -
trunk/src/util/object_manager.cc
r7368 r7370 133 133 // if (level >= 1) 134 134 { 135 std::list<WorldEntity*>::const_iterator entity;135 ObjectManager::EntityList::const_iterator entity; 136 136 for (entity = this->objectLists[omList].begin(); entity != this->objectLists[omList].end(); entity++) 137 137 { -
trunk/src/world_entities/environments/water.cc
r7198 r7370 211 211 void Water::tick(float dt) 212 212 { 213 std::list<WorldEntity*>entityList = State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ);214 std::list<WorldEntity*>::iterator entity = entityList.begin();213 ObjectManager::EntityList entityList = State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ); 214 ObjectManager::EntityList::iterator entity = entityList.begin(); 215 215 while (entity != entityList.end()) 216 216 { -
trunk/src/world_entities/power_ups/weapon_power_up.cc
r7221 r7370 88 88 this->weapon = dynamic_cast<Weapon*>((weaponXML == NULL) 89 89 ? Factory::fabricate(static_cast<ClassID>(this->weapon->getLeafClassID())) 90 : Factory::fabricate(( TiXmlElement*)this->getXmlElem()->FirstChildElement("weapon")));90 : Factory::fabricate((const TiXmlElement*)this->getXmlElem()->FirstChildElement("weapon"))); 91 91 this->model = this->weapon->getModel(0); 92 92 } -
trunk/src/world_entities/spawning_point.h
r7357 r7370 70 70 ClassID classID; //!< the classid of the entity to spawn 71 71 SpawningPointMode mode; //!< the mode of the spawning point 72 std::list<WorldEntity*>queue; //!< queue of waiting WorldEntities to be spawned72 ObjectManager::EntityList queue; //!< queue of waiting WorldEntities to be spawned 73 73 bool bSpawning; //!< flag to indicate if this spawning point is active or not 74 74 }; -
trunk/src/world_entities/weapons/aim.cc
r7221 r7370 107 107 void Aim::searchTarget() 108 108 { 109 std::list<WorldEntity*>::iterator entity;109 ObjectManager::EntityList::iterator entity; 110 110 111 111 for (entity = State::getObjectManager()->getObjectList(group).begin(); -
trunk/src/world_entities/world_entity.h
r7221 r7370 82 82 OM_LIST& getOMListNumber() { return this->objectListNumber; } 83 83 /** @returns a Reference to the Iterator */ 84 std::list<WorldEntity*>::iterator& getEntityIterator() { return this->objectListIterator; }84 ObjectManager::EntityList::iterator& getEntityIterator() { return this->objectListIterator; } 85 85 86 86 int writeState(const byte* data, int length, int sender); … … 121 121 122 122 OM_LIST objectListNumber; //!< The ObjectList from ObjectManager this Entity is in. 123 std::list<WorldEntity*>::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager.123 ObjectManager::EntityList::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager. 124 124 125 125 float scaling;
Note: See TracChangeset
for help on using the changeset viewer.