Changeset 6710 in orxonox.OLD for trunk

Timestamp:

Jan 25, 2006, 4:18:12 PM (19 years ago)

Author:

bensch

Message:

merged the powerups back to the trunk

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• world_entities/playable.cc (modified) (1 diff)
• world_entities/power_ups/power_up.cc (modified) (1 diff)
• world_entities/power_ups/weapon_power_up.cc (modified) (4 diffs)
• world_entities/power_ups/weapon_power_up.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -300 +300 @@
 void GameWorld::tick(std::list<WorldEntity*> entityList, float dt)
 {
-  std::list<WorldEntity*>::iterator entity;
-  for (entity = entityList.begin(); entity != entityList.end(); entity++)
+  std::list<WorldEntity*>::iterator entity, next;
+  next = entityList.begin();
+  while (next != entityList.end())
+  {
+    entity = next++;
     (*entity)->tick(dt);
-
+  }
 }
 

trunk/src/world_entities/playable.cc

@@ -161 +161 @@
     Weapon* weapon = dynamic_cast<WeaponPowerUp*>(powerUp)->getWeapon();
     WeaponManager* manager = this->getWeaponManager();
-    manager->addWeapon(weapon, 2, -1);
-    return true;
+    return manager->addWeapon(weapon);
   }
   else if(powerUp->isA(CL_PARAM_POWER_UP)) {

trunk/src/world_entities/power_ups/power_up.cc

@@ -70 +70 @@
     this->respawnTime -= dt;
     if(this->respawnTime <= 0) {
+      this->respawn();
       this->toList(OM_COMMON);
-      this->respawn();
     }
   }

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -53 +53 @@
   this->setClassID(CL_WEAPON_POWER_UP, "WeaponPowerUp");
   this->weaponXML = NULL;
+  this->weaponID = CL_NULL;
   this->weapon = NULL;
 }
@@ -70 +71 @@
     LoadParam(root, "weaponID", this, WeaponPowerUp, setWeaponClass);
   }
-  this->model = this->weapon->getModel(0);
 }
 
@@ -81 +81 @@
 {
   this->weapon = dynamic_cast<Weapon*>((weaponXML == NULL)
-      ? Factory::fabricate(static_cast<ClassID>(this->weapon->getClassID()))
-      : Factory::fabricate(weaponXML));
+      ? Factory::fabricate(static_cast<ClassID>(weaponID))
+      : Factory::fabricate((TiXmlElement*)this->getXmlElem()->FirstChildElement("weapon")));
+  this->model = this->weapon->getModel(0);
 }
 
@@ -88 +89 @@
 {
   this->weapon = dynamic_cast<Weapon*>(Factory::fabricate(name));
+  this->weaponID = (ClassID)this->weapon->getLeafClassID();
+  this->model = this->weapon->getModel(0);
 }
 

trunk/src/world_entities/power_ups/weapon_power_up.h

@@ -34 +34 @@
 private:
   Weapon* weapon;
+  ClassID weaponID;
   const TiXmlElement* weaponXML;
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -130 +130 @@
   this->getWeaponManager()->changeWeaponConfig(1);
 
-  //EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;