Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jun 14, 2007, 9:28:51 AM (18 years ago)
Author:
nicolasc
Message:

xfer, should work…

Location:
branches/vs-enhencements/src/world_entities
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

    r10687 r10691  
    2424#include "world_entities/weapons/weapon_manager.h"
    2525
    26 #include "weapons/test_gun.h"
     26// #include "weapons/test_gun.h"
    2727#include "weapons/light_blaster.h"
    2828#include "weapons/medium_blaster.h"
     
    3232#include "weapons/disruptor.h"
    3333#include "weapons/swarm_launcher.h"
    34 #include "weapons/spike_thrower.h"
    35 #include "weapons/acid_launcher.h"
    36 #include "weapons/boomerang_gun.h"
    37 #include "weapons/turret.h"
    38 #include "weapons/cannon.h"
     34// #include "weapons/spike_thrower.h"
     35// #include "weapons/acid_launcher.h"
     36// #include "weapons/boomerang_gun.h"
     37// #include "weapons/turret.h"
     38// #include "weapons/cannon.h"
    3939
    4040#include "elements/glgui_energywidgetvertical.h"
     
    159159  //weapons:
    160160
     161//   WeaponManager::WeaponManager(this->weaponMan);
     162//   WeaponManager::WeaponManager(this->secWeaponMan);
     163
    161164  this->weaponMan.setParentEntity( this);
    162165  this->secWeaponMan.setParentEntity( this);
     
    165168  this->secWeaponMan.setSlotCount(6);
    166169
    167   this->weaponMan.createWeaponSlot(0, 3.270, 1.028, .155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
    168   this->weaponMan.createWeaponSlot(1, 3.270, 1.028, -.155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
    169   this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
    170   this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
    171   this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
    172   this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
    173   this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
    174   this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
    175 
    176 
     170//   printf("creating WS ...");
     171//   this->weaponMan.createWeaponSlot(0, 3.270, 1.028, .155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
     172//   this->weaponMan.createWeaponSlot(1, 3.270, 1.028, -.155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
     173//   this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
     174//   this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
     175//   this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
     176//   this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
     177//   this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
     178//   this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
     179
     180//   printf("done\nloading primary weapons...");
    177181  this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
    178182  this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
     
    193197  this->weaponMan.addWeaponToSlot(3, 6, "Disruptor");
    194198  this->weaponMan.addWeaponToSlot(3, 7, "Disruptor");
    195 
     199//   printf("done\n");
    196200
    197201  this->secWeaponMan.createWeaponSlot(0, 1.5, 3, 0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
     
    211215  Playable::weaponConfigChanged();
    212216
    213 //   this->bInit = false;
     217  this->bInit = false;
    214218
    215219  loadEnergyShare(.3,.3,.4);
     
    470474void SpaceShip::tick (float time)
    471475{
    472 /*
     476
     477  printf( "loading WS..." );
     478
    473479  if( !this->bInit)
    474480  {
     
    489495    }
    490496  this->bInit = true;
    491   }*/
     497  }
     498  printf (" done\n");
    492499
    493500  // Playable::tick(time);
     
    495502 // this->test->tick(time);
    496503
     504  printf("Calling WM tick\n");
    497505  // Own Tick Setup, as a different fire routine is used on the weapon manager
    498506  this->weaponMan.tick(time);
    499507  this->secWeaponMan.tick(time);
     508  printf("WM ticks done\n" );
     509
    500510
    501511  if( this->systemFailure() )
  • branches/vs-enhencements/src/world_entities/space_ships/space_ship.h

    r10687 r10691  
    166166    bool                  bSecFire;           //!< second fire button pressed
    167167
    168 //    bool                  bInit;              //!< set true, if MP have been loaded
     168   bool                  bInit;              //!< set true, if MP have been loaded
    169169
    170170    /*
  • branches/vs-enhencements/src/world_entities/weapons/weapon_manager.h

    r10678 r10691  
    2828#define    WM_MAX_SLOTS            10             //!< How many slots the WeaponManager has at its max
    2929#define    WM_MAX_CONFIGS          4              //!< The maximum number of predefined Configurations
    30 #define    WM_MAX_LOADED_WEAPONS   20             //!< The
     30// #define    WM_MAX_LOADED_WEAPONS   20             //!< The
    3131
    3232//! This is a special class, that can handle many different Weapons of a ship/man/whatever.
Note: See TracChangeset for help on using the changeset viewer.