Changeset 10235 in orxonox.OLD for branches

Timestamp:

Jan 14, 2007, 4:34:23 PM (18 years ago)

Author:

nicolasc

Message:

inital upload of projectile_weapon, started usage in spike_ball

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• projectiles/projectile_weapon.cc (added)
• projectiles/projectile_weapon.h (added)
• projectiles/spike_ball.cc (modified) (5 diffs)
• projectiles/spike_ball.h (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (2 diffs)

branches/playability/src/world_entities/WorldEntities.am

@@ -58 +58 @@
                 world_entities/projectiles/hyperblast.cc \
                 world_entities/projectiles/spike.cc \
+                world_entities/projectiles/acid_splash.cc \
+                \
+                world_entities/projectiles/projectile_weapon.cc \
                 world_entities/projectiles/spike_ball.cc \
-                world_entities/projectiles/acid_splash.cc \
                 \
                 world_entities/power_ups/turret_power_up.cc \
@@ -180 +182 @@
                 projectiles/acid_splash.h \
                 \
+                projectiles/projectile_weapon.h \
+                projectiles/spike_ball.h \
+                \
                 power_ups/turret_power_up.h \
                 power_ups/laser_power_up.h \

branches/playability/src/world_entities/projectiles/spike_ball.cc

@@ -31 +31 @@
 #include "space_ships/space_ship.h"
 
-#include "weapons/weapon.h"
-#include "../weapons/weapon_manager.h"
+// #include "weapons/weapon.h"
+// #include "../weapons/weapon_manager.h"
 
 #include "class_id_DEPRECATED.h"
@@ -41 +41 @@
  *  standard constructor
 */
-SpikeBall::SpikeBall () : Projectile()
+SpikeBall::SpikeBall () : ProjectileWeapon()
 {
   this->registerObject(this, SpikeBall::_objectList);
@@ -65 +65 @@
   this->halo->setSize(2, 2);
   this->halo->setTexture("hbolt_halo.png");
-
+/*
   this->weaponMan = new WeaponManager(dynamic_cast<WorldEntity*>(this));
   this->weaponMan->setParentEntity(this);
@@ -77 +77 @@
   this->weaponMan->changeWeaponConfig(0);
 
-  this->weaponMan->getWeapon(0)->increaseEnergy(50);
+  this->weaponMan->getWeapon(0)->increaseEnergy(50);*/
 }
 
@@ -195 +195 @@
 void SpikeBall::destroy (WorldEntity* killer)
 {
-  Projectile::destroy( killer );
+  ProjectileWeapon::destroy( killer );
   PRINTF(5)("DESTROY SpikeBall\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.

branches/playability/src/world_entities/projectiles/spike_ball.h

@@ -7 +7 @@
 #define _SPIKE_BALL_H
 
-#include "projectile.h"
+#include "projectile_weapon.h"
 #include "effects/billboard.h"
 
-#include "../weapons/spike_launcher.h"
+// #include "../weapons/spike_launcher.h"
 
 
@@ -16 +16 @@
 
 class Vector;
-class Weapon;
+class ProjectileWeapon;
 class SpriteParticles;
 class ParticleEmitter;
 class FastFactory;
-class WeaponManager;
+class FastFactory;
 
 
-class SpikeBall : public Projectile
+class SpikeBall : public ProjectileWeapon
 {
   ObjectListDeclaration(SpikeBall);

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

@@ -176 +176 @@
   cannon->setName( "SwarmLauncher");
 
-  Weapon* spike = new SpikeThrower();
-  spike->setName( "SpikeThrower" );
+//   Weapon* spike = new SpikeThrower();
+//   spike->setName( "SpikeThrower" );
 
   Weapon* spike2 = new SpikeLauncher();
-  spike->setName( "SpikeLauncher" );
+  spike2->setName( "SpikeLauncher" );
 
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
@@ -201 +201 @@
 
   this->secWeaponMan.addWeapon( cannon, 0, 0);
-  this->secWeaponMan.addWeapon( spike, 1, 1);
+/*  this->secWeaponMan.addWeapon( spike, 1, 1);*/
   this->secWeaponMan.addWeapon( spike2, 2, 2);
 
   
   this->weaponMan.changeWeaponConfig(3);
-  this->secWeaponMan.changeWeaponConfig(1);
+  this->secWeaponMan.changeWeaponConfig(2);
 
   curWeaponPrimary    = 3;