Changeset 4885 in orxonox.OLD for orxonox/trunk/src/world_entities/player.cc

Timestamp:

Jul 18, 2005, 3:36:18 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the weaponSystem back to the trunk, because it seems safe
merged with command:
svn merge -r 4847:HEAD branches/weaponSystem/ trunk/
conflict in file src/world-entities/weapons/weapon.h resolved in favor of the weaponSystem

File:

• orxonox/trunk/src/world_entities/player.cc (modified) (10 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -23 +23 @@
 
 #include "weapon_manager.h"
-#include "weapon.h"
 #include "test_gun.h"
 #include "world.h"
 
 #include "list.h"
-#include "stdincl.h"
 
 #include "event_handler.h"
 
-#include "projectile.h"
 #include "event.h"
 
@@ -41 +38 @@
 
 /**
- *  creates a new Player
+ * creates a new Player
  * @param isFree if the player is free
 */
 Player::Player()
 {
-  /*
-    this is the debug player - actualy we would have to make a new
-     class derivated from Player for each player. for now, we just use
-     the player.cc for debug also
-  */
   this->init();
 
@@ -75 +67 @@
   delete this->weaponMan;
 }
-
 
 /**
@@ -119 +110 @@
 
 /**
- *
+ * loads the Settings of a Player from an XML-element.
  * @param root the XML-element to load the Player's properties from
  */
@@ -132 +123 @@
 
 /**
- *  adds a weapon to the weapon list of player
+ * adds a weapon to the weapon list of player
  * @param weapon to add
 */
@@ -219 +210 @@
 void Player::tick (float time)
 {
-  //printf("%p\n", this);
-  //this->getRelCoor().debug();
-
-  /* link tick to weapon */
-  //this->activeWeapon->tick(time);
-  //this->activeWeaponL->tick(time); //FIX FIX DELETE REMOVE
-  this->weaponMan->tick(time);
   // player controlled movement
   this->move(time);
+
+  this->weaponMan->tick(time);
   // weapon system manipulation
-  this->weapon();
+  this->weaponAction();
 }
 
@@ -255 +241 @@
   if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
     accel = accel + (orthDirection*acceleration);
-  if( this->bAscend )
+  if( this->bAscend ) { /* FIXME */ }
   if( this->bDescend) {/* FIXME */} /* @todo up and down player movement */
 
@@ -264 +250 @@
 
 /**
- *  weapon manipulation by the player
-*/
-void Player::weapon()
+ * weapon manipulation by the player
+*/
+void Player::weaponAction()
 {
   if( this->bFire)
@@ -279 +265 @@
 }
 
-
-/**
- *  The connection to the command node
- * @param cmd the Command unit from witch to map
-
-   here the commands are mapped to the players movement/weaponary
-*/
-void Player::command (Command* cmd)
-{
-  PRINTF(3)("recieved command [%s]\n", cmd->cmd);
-  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_UP)) this->bUp = !cmd->bUp;
-  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_DOWN)) this->bDown = !cmd->bUp;
-  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_LEFT)) this->bLeft = !cmd->bUp;
-  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_RIGHT)) this->bRight = !cmd->bUp;
-  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_FIRE)) this->bFire = !cmd->bUp;
-  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_NEXT_WEAPON)) if(cmd->bUp) this->bWeaponChange = !this->bWeaponChange;
-}
-
 /**
  * @todo switch statement ??
@@ -303 +271 @@
 {
   if( event.type == KeyMapper::PEV_UP)
-    {
       this->bUp = event.bPressed;
-    }
   else if( event.type == KeyMapper::PEV_DOWN)
-    {
       this->bDown = event.bPressed;
-    }
   else if( event.type == KeyMapper::PEV_RIGHT)
-    {
       this->bRight= event.bPressed;
-    }
   else if( event.type == KeyMapper::PEV_LEFT)
-    {
       this->bLeft = event.bPressed;
-    }
   else if( event.type == KeyMapper::PEV_FIRE1)
-    {
-       this->bFire = event.bPressed;
-    }
+      this->bFire = event.bPressed;
   else if( event.type == KeyMapper::PEV_NEXT_WEAPON)
-    {
       if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
-    }
-
-}
+
+}