Changeset 10704 in orxonox.OLD for branches/presentation/src/world_entities/creatures

Timestamp:

Jun 15, 2007, 11:12:29 AM (18 years ago)

Author:

rennerc

Message:

FPSSniperRifle uses BspWeapon now

Location:

branches/presentation/src/world_entities/creatures

Files:

• fps_player.cc (modified) (6 diffs)
• fps_player.h (modified) (2 diffs)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -63 +63 @@
 {
   this->setPlayer(NULL);
-
-  if( this->aimingSystem)
-    delete this->aimingSystem;
 }
 
@@ -126 +123 @@
   registerEvent(KeyMapper::PEV_JUMP);
   registerEvent(KeyMapper::PEV_CROUCH);
+  registerEvent(KeyMapper::PEV_FIRE1);
   registerEvent(EV_MOUSE_MOTION);
-
-  this->aimingSystem = NULL;
 
   // weapon manager for the fps
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
-  if( State::isOnline())
-  {
-    Weapon* wpRight = new FPSSniperRifle(0);
-    wpRight->setName("testGun Right");
-    this->addWeapon(wpRight,1, 0);
-    wpRight->addChild(this->aimingSystem);
-
-    this->toList( OM_PLAYERS );
-  }
-
-  this->aimingSystem = new AimingSystem(this);
-
-
+  
+
+  //this->aimingSystem = new AimingSystem(this);
+
+#if 0
   this->getWeaponManager().changeWeaponConfig(1);
   this->getWeaponManager().setSlotCount(2);
@@ -160 +148 @@
   this->getWeaponManager().getFixedTarget()->setParentMode(PNODE_ALL);
   this->getWeaponManager().getFixedTarget()->setRelCoor(10,0,0);
+  
+  if( true /*State::isOnline()*/ )
+  {
+    FPSSniperRifle* wpRight = new FPSSniperRifle(0);
+    wpRight->setName("testGun Right");
+    this->addWeapon(wpRight,1, 0);
+    wpRight->toList( this->getOMListNumber() );
+    wpRight->setParent( &this->cameraNode );
+    wpRight->requestAction( WA_ACTIVATE );
+    //wpRight->addChild(this->aimingSystem);
+
+    //this->toList( OM_PLAYERS );
+  }
+#endif
+                         
+  FPSSniperRifle* wpRight = new FPSSniperRifle(0);
+  wpRight->setName("testGun Right");
+  wpRight->toList( this->getOMListNumber() );
+  wpRight->setParent( &this->cameraNode );
+  
+  this->weaponMan.setParentEntity( this );
+  this->weaponMan.setSlotCount(1);
+  this->weaponMan.createWeaponSlot(0, this->cameraNode.getRelCoor().x, this->cameraNode.getRelCoor().y, this->cameraNode.getRelCoor().z, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.addWeapon(wpRight, 0, 0);
+  this->weaponMan.changeWeaponConfig(0);
+  Playable::weaponConfigChanged();
+  this->weaponMan.getFixedTarget()->setParent(&this->cameraNode );
+  this->weaponMan.getFixedTarget()->setRelCoor( 100000,0,0 );
 
 
@@ -269 +285 @@
     State::getCamera()->setViewMode(Camera::ViewFPS);
 
-
-    if( this->aimingSystem != NULL)
-    {
-      this->aimingSystem->toList(OM_GROUP_01);
-      this->aimingSystem->setParent(&this->cameraNode);
-  //     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
-      this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
-      this->aimingSystem->setRelCoor(0, -1, -1);
-    }
 
   }
@@ -353 +360 @@
   if( this->bFire)
   {
+    PRINTF(0)("FPSPLAYER FIRE %d\n", this->getOMListNumber() );
     this->getWeaponManager().fire();
-  }
-
-
-  //dealing damage
-  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/))
-  {
-    this->damageTicker -= time;
-
-    if ( this->damageTicker <= 0.0f && this->beFire() )
-    {
-      this->damageTicker = 0.25;
-
-      WorldEntity * victim = aimingSystem->getNearestTarget();
-
-      if ( victim )
-      {
-        PRINTF(0)("FIRE: hit %s\n", victim->getClassCName());
-        victim->hit( 20, this );
-      }
-      else
-      {
-        PRINTF(0)("FIRE: nothing hit\n");
-      }
-    }
   }
 
@@ -533 +517 @@
 
   this->setOnGround(false);
-  if( this->aimingSystem != NULL)
-    this->aimingSystem->flushList();
     
 }

branches/presentation/src/world_entities/creatures/fps_player.h

@@ -11 +11 @@
 
 
-class AimingSystem;
+class FPSSniperRifle;
 
 
@@ -72 +72 @@
     bool                  changingZoom;
 
-    AimingSystem*         aimingSystem;      //!< aiming system of the player
-
     float                 damageTicker;      //!< ticker for dealing damage
+    
+    FPSSniperRifle*       weapon;
     
 };