Changeset 9922 in orxonox.OLD for branches/network/src/world_entities/creatures/fps_player.cc

Timestamp:

Nov 9, 2006, 3:30:59 PM (18 years ago)

Author:

patrick

Message:

network bug fixed

File:

• branches/network/src/world_entities/creatures/fps_player.cc (modified) (2 diffs)

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

@@ -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()*/))
   {
@@ -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);
-//     }
   }