Changeset 9150 in orxonox.OLD for branches

Timestamp:

Jul 4, 2006, 3:54:44 PM (18 years ago)

Author:

rennerc

Message:

fpsplayer in om_players

Location:

branches/presentation/src/world_entities/creatures

Files:

• fps_player.cc (modified) (1 diff)
• fps_player.h (modified) (1 diff)

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

@@ -403 +403 @@
 }
 
-/*
 void FPSPlayer::respawn( )
 {
-  Playable::respawn();
-
-  AABB* box = this->getModelAABB();
-  if( box != NULL)
-  {
-    float f = 1.3f;
-    State::getCameraNode()->setRelCoor(0, box->halfLength[1] * f, 0);
-    State::getCameraTargetNode()->setRelCoor(10, box->halfLength[1] * f, 0);
-
-    this->getWeaponManager().setSlotPosition(0, Vector(1.5, box->halfLength[1] * f - 0.7, 1.1));
-    this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * f, 0.0));
-  }
-}
-*/
-
-
-
+  toList( OM_PLAYERS );
+}
+

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

@@ -27 +27 @@
     virtual void reset();
     
-    //virtual void respawn();
+    virtual void respawn();
 
     virtual void tick(float time);