Changeset 10173 in orxonox.OLD for branches

Timestamp:

Jan 3, 2007, 4:56:20 PM (18 years ago)

Author:

nicolasc

Message:

bump2

Location:

branches/playability/src/world_entities

Files:

• projectiles/spike.cc (modified) (2 diffs)
• projectiles/spike.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)

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

@@ -57 +57 @@
   this->angle = 0;
   this->rotationSpeed = 130;
-
+/*
   this->halo = new Billboard();
   this->halo->setSize(.35, .35);
-  this->halo->setTexture("hbolt_halo.png");
+  this->halo->setTexture("hbolt_halo.png");*/
 }
 
@@ -171 +171 @@
   this->getModel()->draw();
 
-  this->halo->draw();
+//   this->halo->draw();
 
   glPopMatrix();

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

@@ -45 +45 @@
     float                             rotationSpeed;
 
-    Billboard*                        halo;
+//     Billboard*                        halo;
 
     WorldEntity* hitEntity; // FIXME TEMPORARY

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

@@ -171 +171 @@
   //wpLeft3->setParent( this);
 
-  Weapon* cannon = new SpikeLauncher();
-  cannon->setName( "SpikeLauncher");
+  Weapon* cannon = new SwarmLauncher();
+  cannon->setName( "SwarmLauncher");
   //cannon->setParent( this);