Changeset 10023 in orxonox.OLD

Timestamp:

Dec 6, 2006, 4:47:06 PM (17 years ago)

Author:

marcscha

Message:

little modifications to swarm launcher

Location:

branches/playability/src

Files:

• defs/class_id_DEPRECATED.h (modified) (1 diff)
• util/hud.cc (modified) (3 diffs)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/player.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (5 diffs)
• world_entities/space_ships/space_ship.h (modified) (2 diffs)
• world_entities/weapons/swarm_launcher.cc (added)
• world_entities/weapons/swarm_launcher.h (added)
• world_entities/weapons/swarm_missile.cc (deleted)
• world_entities/weapons/swarm_missile.h (deleted)
• world_entities/weapons/weapon_manager.cc (modified) (1 diff)

branches/playability/src/defs/class_id_DEPRECATED.h

@@ -225 +225 @@
   CL_FPS_LASER_RIFLE            =    0x000003a8,
   CL_BOOMERANG_GUN              =    0x000003a9,
+  CL_SWARM_LAUNCHER             =    0x000003aa,
 
   // Projectiles

branches/playability/src/util/hud.cc

@@ -175 +175 @@
         weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
         weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
-        //      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
+        //weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
         this->weaponsWidgets.push_back(weapon->getEnergyWidget());
       }
@@ -190 +190 @@
         weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
         weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
-        //      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
+        //weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
         this->weaponsWidgets.push_back(weapon->getEnergyWidget());
       }
@@ -236 +236 @@
 
   std::list<OrxGui::GLGuiWidget*>::iterator weaponWidget;
-  Vector2D pos(0.3, .9);
+  Vector2D pos(0.3, .7);
   for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos.x+=.2)
   {

branches/playability/src/world_entities/WorldEntities.am

@@ -40 +40 @@
                 world_entities/weapons/medium_blaster.cc \
                 world_entities/weapons/heavy_blaster.cc \
-                world_entities/weapons/swarm_missile.cc \
+                world_entities/weapons/swarm_launcher.cc \
                 \
                 world_entities/projectiles/bolt.cc \
@@ -152 +152 @@
                 weapons/medium_blaster.h \
                 weapons/heavy_blaster.h \
-                weapons/swarm_missile.h \
+                weapons/swarm_launcher.h \
                 \
                 projectiles/bolt.h \

branches/playability/src/world_entities/player.cc

@@ -16 +16 @@
 #include "player.h"
 #include "playable.h"
+#include "space_ships/space_ship.h"
 
 #include "event_handler.h"
@@ -74 +75 @@
     this->playable = playable;
     this->_hud.setEnergyWidget(this->playable->getHealthWidget());
-    this->_hud.setWeaponManager(&this->playable->getWeaponManager());
+    /*if (dynamic_cast<SpaceShip*>(this->playable))
+      this->_hud.setWeaponManager(&this->playable->getWeaponManager(), &dynamic_cast<SpaceShip*>(this->playable)->getWeaponManagerSecondary());
+    else*/
+      this->_hud.setWeaponManager(&this->playable->getWeaponManager());
 
     this->playable->setPlayer(this);

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

@@ -26 +26 @@
 #include "weapons/medium_blaster.h"
 #include "weapons/heavy_blaster.h"
-#include "weapons/swarm_missile.h"
+#include "weapons/swarm_launcher.h"
 #include "weapons/boomerang_gun.h"
 #include "weapons/turret.h"
@@ -154 +154 @@
   wpLeft2->setName("Medium Blaster Left");
 
-  Weapon* wpRight3 = new HeavyBlaster ();
+/*  Weapon* wpRight3 = new HeavyBlaster ();
   wpRight3->setName("Heavy Blaster Right");
   Weapon* wpLeft3 = new HeavyBlaster ();
-  wpLeft3->setName("Heavy Blaster Left");
-
-  Weapon* cannon = new SwarmMissile();
-  cannon->setName("Swarm Missile");
+  wpLeft3->setName("Heavy Blaster Left");*/
+
+  Weapon* cannon = new SwarmLauncher();
+  cannon->setName("SwarmLauncher");
   
 
@@ -168 +168 @@
   this->weaponMan.addWeapon( wpLeft2, 0, 2);
   this->weaponMan.addWeapon( wpRight2, 0, 3);
-  this->weaponMan.addWeapon( wpLeft3, 0, 4);
-  this->weaponMan.addWeapon( wpRight3, 0, 5);
-
-  this->secWeaponMan.addWeapon( cannon, 0, 0);
+/*  this->weaponMan.addWeapon( wpLeft3, 0, 4);
+  this->weaponMan.addWeapon( wpRight3, 0, 5);*/
+
+  this->secWeaponMan.addWeapon( cannon, 1, 0);
 
   this->weaponMan.changeWeaponConfig(0);
+  this->secWeaponMan.changeWeaponConfig(1);
 
   wpRight1->requestAction(WA_ACTIVATE);
@@ -179 +180 @@
   wpRight2->requestAction(WA_ACTIVATE);
   wpLeft2->requestAction(WA_ACTIVATE);
-  wpRight3->requestAction(WA_ACTIVATE);
-  wpLeft3->requestAction(WA_ACTIVATE);
+/*  wpRight3->requestAction(WA_ACTIVATE);
+  wpLeft3->requestAction(WA_ACTIVATE);*/
 
   cannon->requestAction(WA_ACTIVATE);
@@ -369 +370 @@
   registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
+  registerVar( new SynchronizeableBool( &bFire, &bFire, "bSecFire", PERMISSION_OWNER));
 
   registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity", PERMISSION_MASTER_SERVER ) );

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

@@ -89 +89 @@
     short                 supportedPlaymodes; //!< What Playmodes are Supported in this Playable.
     Playable::Playmode    playmode;           //!< The current playmode.
-    bool                  bSecFire;
 
     //ship atributes
@@ -135 +134 @@
     bool                  bRollL;             //!< rolling button pressed (left)
     bool                  bRollR;             //!< rolling button pressed (right)
+    bool                  bSecFire;           //!< second fire button pressed
 
     /*

branches/playability/src/world_entities/weapons/weapon_manager.cc

@@ -481 +481 @@
       if (tickWeapon != NULL)
       {
-           //        if (this->parent != NULL)
-          tickWeapon->toList(this->parentEntity->getOMListNumber());
+        //if (this->parent != NULL)
+        tickWeapon->toList(this->parentEntity->getOMListNumber());
         tickWeapon->requestAction(WA_ACTIVATE);
         this->currentSlotConfig[i].position.activateNode();