Changeset 5988 in orxonox.OLD

Timestamp:

Dec 8, 2005, 10:39:31 AM (18 years ago)

Author:

manuel

Message:

branch compiles again. factory problems solved

Location:

branches/powerups/src

Files:

• lib/sound/sound_engine.cc (modified) (2 diffs)
• world_entities/power_ups/weapon_power_up.cc (modified) (3 diffs)
• world_entities/power_ups/weapon_power_up.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

branches/powerups/src/lib/sound/sound_engine.cc

@@ -289 +289 @@
   }
   // INITIALIZING THE DEVICE:
-  ALCchar deviceName[] =
+  ALubyte deviceName[] =
 #ifdef __WIN32__
       "Direct3D";
@@ -300 +300 @@
   this->context = alcCreateContext(this->device, NULL);
 
-  alcMakeContextCurrent(this->context); 
+  alcMakeContextCurrent(this->context);
 
   if ((result = alGetError()) != AL_NO_ERROR)

branches/powerups/src/world_entities/power_ups/weapon_power_up.cc

@@ -49 +49 @@
 void WeaponPowerUp::init()
 {
+  weaponXML = NULL;
+  weapon = NULL;
 }
 
@@ -56 +58 @@
   static_cast<PowerUp*>(this)->loadParams(root);
   const TiXmlElement* elem = root->FirstChildElement("weapon");
-  if(elem != NULL && (elem = elem->getFirstChildElement()) != NULL)
+  if(elem != NULL && (elem = elem->FirstChildElement()) != NULL)
   {
     this->weaponXML = elem;
@@ -75 +77 @@
 {
   this->weapon = dynamic_cast<Weapon*>((weaponXML == NULL)
-      ? Factory::getFirst()->fabricate(static_cast<ClassID>(this->weapon->getClassID()))
-      : Factory::getFirst()->fabricate(weaponXML));
+      ? Factory::fabricate(static_cast<ClassID>(this->weapon->getClassID()))
+      : Factory::fabricate(weaponXML));
 }
 
 void WeaponPowerUp::setWeaponClass(const char* name)
 {
-  this->weapon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(name, name));
+  this->weapon = dynamic_cast<Weapon*>(Factory::fabricate(name));
 }
+
+void WeaponPowerUp::hide()
+{
+  PowerUp::hide();
+  this->createWeapon();
+}

branches/powerups/src/world_entities/power_ups/weapon_power_up.h

@@ -22 +22 @@
   void setWeaponClass(const char* name);
 
+protected:
+  void hide();
+
 private:
   void init();

branches/powerups/src/world_entities/space_ships/space_ship.cc

@@ -419 +419 @@
 {
   if(powerUp->isA(CL_WEAPON_POWER_UP)) {
-    Weapon weapon = dynamic_cast<WeaponPowerUp*>(powerUp)->getWeapon();
+    Weapon* weapon = dynamic_cast<WeaponPowerUp*>(powerUp)->getWeapon();
     WeaponManager* manager = this->getWeaponManager();
     int slot = manager->getNextFreeSlot(0, weapon->getCapability());