Changeset 10691 in orxonox.OLD

Timestamp:

Jun 14, 2007, 9:28:51 AM (17 years ago)

Author:

nicolasc

Message:

xfer, should work…

Location:

branches/vs-enhencements/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (9 diffs)
• space_ships/space_ship.h (modified) (1 diff)
• weapons/weapon_manager.h (modified) (1 diff)

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

@@ -24 +24 @@
 #include "world_entities/weapons/weapon_manager.h"
 
-#include "weapons/test_gun.h"
+// #include "weapons/test_gun.h"
 #include "weapons/light_blaster.h"
 #include "weapons/medium_blaster.h"
@@ -32 +32 @@
 #include "weapons/disruptor.h"
 #include "weapons/swarm_launcher.h"
-#include "weapons/spike_thrower.h"
-#include "weapons/acid_launcher.h"
-#include "weapons/boomerang_gun.h"
-#include "weapons/turret.h"
-#include "weapons/cannon.h"
+// #include "weapons/spike_thrower.h"
+// #include "weapons/acid_launcher.h"
+// #include "weapons/boomerang_gun.h"
+// #include "weapons/turret.h"
+// #include "weapons/cannon.h"
 
 #include "elements/glgui_energywidgetvertical.h"
@@ -159 +159 @@
   //weapons:
 
+//   WeaponManager::WeaponManager(this->weaponMan);
+//   WeaponManager::WeaponManager(this->secWeaponMan);
+
   this->weaponMan.setParentEntity( this);
   this->secWeaponMan.setParentEntity( this);
@@ -165 +168 @@
   this->secWeaponMan.setSlotCount(6);
 
-  this->weaponMan.createWeaponSlot(0, 3.270, 1.028, .155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(1, 3.270, 1.028, -.155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-
+//   printf("creating WS ...");
+//   this->weaponMan.createWeaponSlot(0, 3.270, 1.028, .155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(1, 3.270, 1.028, -.155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+//   printf("done\nloading primary weapons...");
   this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
   this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
@@ -193 +197 @@
   this->weaponMan.addWeaponToSlot(3, 6, "Disruptor");
   this->weaponMan.addWeaponToSlot(3, 7, "Disruptor");
-
+//   printf("done\n");
 
   this->secWeaponMan.createWeaponSlot(0, 1.5, 3, 0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
@@ -211 +215 @@
   Playable::weaponConfigChanged();
 
-//   this->bInit = false;
+  this->bInit = false;
 
   loadEnergyShare(.3,.3,.4);
@@ -470 +474 @@
 void SpaceShip::tick (float time)
 {
-/*
+
+  printf( "loading WS..." );
+
   if( !this->bInit)
   {
@@ -489 +495 @@
     }
   this->bInit = true;
-  }*/
+  }
+  printf (" done\n");
 
   // Playable::tick(time);
@@ -495 +502 @@
  // this->test->tick(time);
 
+  printf("Calling WM tick\n");
   // Own Tick Setup, as a different fire routine is used on the weapon manager
   this->weaponMan.tick(time);
   this->secWeaponMan.tick(time);
+  printf("WM ticks done\n" );
+
 
   if( this->systemFailure() )

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

@@ -166 +166 @@
     bool                  bSecFire;           //!< second fire button pressed
 
-//    bool                  bInit;              //!< set true, if MP have been loaded
+   bool                  bInit;              //!< set true, if MP have been loaded
 
     /*

branches/vs-enhencements/src/world_entities/weapons/weapon_manager.h

@@ -28 +28 @@
 #define    WM_MAX_SLOTS            10             //!< How many slots the WeaponManager has at its max
 #define    WM_MAX_CONFIGS          4              //!< The maximum number of predefined Configurations
-#define    WM_MAX_LOADED_WEAPONS   20             //!< The
+// #define    WM_MAX_LOADED_WEAPONS   20             //!< The
 
 //! This is a special class, that can handle many different Weapons of a ship/man/whatever.