Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9922 in orxonox.OLD for branches/network


Ignore:
Timestamp:
Nov 9, 2006, 3:30:59 PM (18 years ago)
Author:
patrick
Message:

network bug fixed

Location:
branches/network/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/lib/graphics/importer/md2/resource_md2.cc

    r9912 r9922  
    1010{
    1111  Resources::StorePointer* ptr = this->acquireResource(loadString(modelName, skinName, scale));
    12  
     12
    1313  if (ptr)
    1414  {
  • branches/network/src/world_entities/creatures/fps_player.cc

    r9911 r9922  
    273273  {
    274274    this->getWeaponManager().fire();
    275 
    276 //     WorldEntity* target = this->aimingSystem->getNearestTarget();
    277 //     if( target != NULL)
    278 //     {
    279 //       PRINTF(0)("hit hit hit, got: %s\n", target->getClassCName());
    280 //     }
    281 //     else
    282 //     {
    283 //       PRINTF(0)("nothing hit\n");
    284 //     }
    285275  }
    286276
    287277
    288278  //dealing damage
    289 
    290279  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/))
    291280  {
     
    404393
    405394
    406   if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(CL_INTERACTIVE_MODEL))
     395  if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(InteractiveModel::staticClassID()))
    407396  {
    408397    ((InteractiveModel*)this->getModel(0))->tick(time);
    409 
    410     // handle animations differently
    411 
    412 
    413 
    414 
    415 
    416 //     else if( this->bFire && likely(this->getModel(0) != NULL))
    417 //     {
    418 //       if( ((InteractiveModel*)this->getModel(0))->getAnim() != ATTACK)
    419 //         ((InteractiveModel*)this->getModel(0))->setAnimation(ATTACK);
    420 //     }
    421 //     else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL))
    422 //     {
    423 //       if( ((InteractiveModel*)this->getModel(0))->getAnim() != RUN)
    424 //         ((InteractiveModel*)this->getModel(0))->setAnimation(RUN);
    425 //     }
    426 //     else if (likely(this->getModel(0) != NULL))
    427 //     {
    428 //       if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND)
    429 //         ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);
    430 //     }
    431398  }
    432399
  • branches/network/src/world_entities/spectator.cc

    r9921 r9922  
    2323
    2424#include "src/world_entities/creatures/fps_player.h"
     25#include "src/world_entities/npcs/generic_npc.h"
    2526
    2627#include "class_id_DEPRECATED.h"
     
    234235  else if( event.type == KeyMapper::PEV_JUMP)
    235236  {
    236     FPSPlayer * fps = new FPSPlayer();
     237//     FPSPlayer * fps = new FPSPlayer();
     238    //GenericNPC* fps = new GenericNPC();
     239    WorldEntity* fps = new WorldEntity();
    237240    //WorldEntity * fps = new WorldEntity();
    238    
     241
    239242    fps->setAbsCoor( this->getAbsCoorX(), this->getAbsCoorY(), this->getAbsCoorZ() );
    240243    fps->setAbsDir( this->getAbsDir() );
    241244    fps->loadMD2Texture( "doom_guy.png" );
    242245    fps->loadModel( "models/creatures/doom_guy.md2", 10.0f );
     246    fps->toList( OM_GROUP_00);
    243247    //fps->loadModel( "models/ships/terran_cruizer.obj" );
    244248
Note: See TracChangeset for help on using the changeset viewer.