Changeset 10641 in orxonox.OLD for branches/vs-enhencements/src/world_entities

Timestamp:

Apr 26, 2007, 2:10:37 PM (18 years ago)

Author:

nicolasc

Message:

bump

Location:

branches/vs-enhencements/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (4 diffs)
• weapons/rf_cannon.cc (added)
• weapons/rf_cannon.h (added)

branches/vs-enhencements/src/world_entities/WorldEntities.am

@@ -33 +33 @@
                 world_entities/weapons/spike_thrower.cc \
                 world_entities/weapons/acid_launcher.cc \
+                world_entities/weapons/rf_cannon.cc \
                 \
                 world_entities/projectiles/lbolt.cc \
@@ -184 +185 @@
                 weapons/spike_thrower.h \
                 weapons/acid_launcher.h \
+                weapons/rf_cannon.h \
                 \
                 projectiles/lbolt.h \

branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

@@ -26 +26 @@
 #include "weapons/medium_blaster.h"
 #include "weapons/heavy_blaster.h"
+#include "weapons/rf_cannon.h"
 #include "weapons/swarm_launcher.h"
 #include "weapons/spike_thrower.h"
@@ -161 +162 @@
   wpLeft1->setName( "LightBlaster");
 
+//   Weapon* wpRight1 = new RFCannon ();
+  wpRight1->setName( "RFCannon");
+//   Weapon* wpLeft1 = new RFCannon ();
+  wpLeft1->setName( "RFCannon");
+
   Weapon* wpRight2 = new MediumBlaster ();
   wpRight2->setName( "MediumBlaster");
@@ -173 +179 @@
   Weapon* cannon = new SwarmLauncher();
   cannon->setName( "SwarmLauncher");
-/*
-  Weapon* spike = new SpikeThrower();
-  spike->setName( "SpikeThrower" );
-
-
-  Weapon* acid0 = new AcidLauncher();
-  acid0->setName( "AcidSplasher" );
-
-  Weapon* acid1 = new AcidLauncher();
-  acid1->setName( "AcidSplasher" );*/
 
 
@@ -1177 +1173 @@
 
   State::getPlayer()->hud().setOverlayPercentage(100-int(100*this->actionWidthPercentage));
-  PRINTF(0)("TravelDistance has been updated\n");
+//   PRINTF(0)("TravelDistance has been updated\n");
   this->isTravelDistanceInit = true;
 }