Changeset 9922 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

network bug fixed

Location:

branches/network/src

Files:

• lib/graphics/importer/md2/resource_md2.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (2 diffs)
• world_entities/spectator.cc (modified) (2 diffs)

branches/network/src/lib/graphics/importer/md2/resource_md2.cc

@@ -10 +10 @@
 {
   Resources::StorePointer* ptr = this->acquireResource(loadString(modelName, skinName, scale));
-  
+
   if (ptr)
   {

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);
-//     }
   }
 

branches/network/src/world_entities/spectator.cc

@@ -23 +23 @@
 
 #include "src/world_entities/creatures/fps_player.h"
+#include "src/world_entities/npcs/generic_npc.h"
 
 #include "class_id_DEPRECATED.h"
@@ -234 +235 @@
   else if( event.type == KeyMapper::PEV_JUMP)
   {
-    FPSPlayer * fps = new FPSPlayer();
+//     FPSPlayer * fps = new FPSPlayer();
+    //GenericNPC* fps = new GenericNPC();
+    WorldEntity* fps = new WorldEntity();
     //WorldEntity * fps = new WorldEntity();
-    
+
     fps->setAbsCoor( this->getAbsCoorX(), this->getAbsCoorY(), this->getAbsCoorZ() );
     fps->setAbsDir( this->getAbsDir() );
     fps->loadMD2Texture( "doom_guy.png" );
     fps->loadModel( "models/creatures/doom_guy.md2", 10.0f );
+    fps->toList( OM_GROUP_00);
     //fps->loadModel( "models/ships/terran_cruizer.obj" );