Changeset 10114 in orxonox.OLD for trunk/src/world_entities/creatures

Timestamp:

Dec 19, 2006, 11:55:26 PM (18 years ago)

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/world_entities/creatures

Files:

• fps_player.cc (modified) (4 diffs)
• md2_creature.cc (modified) (1 diff)

trunk/src/world_entities/creatures/fps_player.cc

@@ -41 +41 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
+
+ObjectListDefinition(FPSPlayer);
 CREATE_FACTORY(FPSPlayer);
 
@@ -273 +273 @@
   {
     this->getWeaponManager().fire();
-
-//     WorldEntity* target = this->aimingSystem->getNearestTarget();
-//     if( target != NULL)
-//     {
-//       PRINTF(0)("hit hit hit, got: %s\n", target->getClassCName());
-//     }
-//     else
-//     {
-//       PRINTF(0)("nothing hit\n");
-//     }
   }
 
 
   //dealing damage
-
   if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/))
   {
@@ -384 +373 @@
 
   // physical falling of the player
-  if( !this->isOnGround())
+  if( /*FIXME for testing*/ false && !this->isOnGround())
   {
     this->fallVelocity += 300.0f * time;
@@ -404 +393 @@
 
 
-  if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(CL_INTERACTIVE_MODEL))
+  if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(InteractiveModel::staticClassID()))
   {
     ((InteractiveModel*)this->getModel(0))->tick(time);
-
-    // handle animations differently
-
-
-
-
-
-//     else if( this->bFire && likely(this->getModel(0) != NULL))
-//     {
-//       if( ((InteractiveModel*)this->getModel(0))->getAnim() != ATTACK)
-//         ((InteractiveModel*)this->getModel(0))->setAnimation(ATTACK);
-//     }
-//     else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL))
-//     {
-//       if( ((InteractiveModel*)this->getModel(0))->getAnim() != RUN)
-//         ((InteractiveModel*)this->getModel(0))->setAnimation(RUN);
-//     }
-//     else if (likely(this->getModel(0) != NULL))
-//     {
-//       if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND)
-//         ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);
-//     }
   }
 

trunk/src/world_entities/creatures/md2_creature.cc

@@ -36 +36 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
+
+ObjectListDefinition(MD2Creature);
 CREATE_FACTORY(MD2Creature);