Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9912 in orxonox.OLD


Ignore:
Timestamp:
Nov 2, 2006, 4:34:52 PM (18 years ago)
Author:
rennerc
Message:

still not working

Location:
branches/network/src
Files:
5 edited

Legend:

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

    r9869 r9912  
    452452  this->loadModel(modelFileName);
    453453  this->loadSkin(skinFileName);
     454 
     455  PRINTF(0)("model %s, skin %s\n", modelFileName.c_str(), skinFileName.c_str());
    454456}
    455457
  • branches/network/src/lib/graphics/importer/md2/resource_md2.cc

    r9869 r9912  
    1010{
    1111  Resources::StorePointer* ptr = this->acquireResource(loadString(modelName, skinName, scale));
    12 
     12 
    1313  if (ptr)
    1414  {
     
    2020    PRINTF(0)("NOT FOUND MD2: %s\n", modelName.c_str());
    2121    std::string modelFileName = this->Resource::locateFile(modelName);
    22     //std::string skinFileName = this->Resource::locateFile(skinName);
     22    std::string skinFileName = this->Resource::locateFile(skinName);
     23    PRINTF(0)("NEW %s::%s\n", modelName.c_str(), modelFileName.c_str());
    2324    this->MD2Model::load(modelFileName, skinName, scale);
    24     this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), keepLevel, this->MD2Model::dataPointer()));
     25    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinFileName, scale), keepLevel, this->MD2Model::dataPointer()));
    2526  }
    2627
  • branches/network/src/lib/lang/base_object.cc

    r9869 r9912  
    4545  for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
    4646  {
    47     if (ORX_DEBUG >= 5)
     47    //if (ORX_DEBUG >= 5)
    4848      assert((*it)._objectList->checkIteratorInList((*it)._iterator) || (*it)._objectList->checkObjectInList(this));
    4949    (*it)._objectList->unregisterObject((*it)._iterator);
  • branches/network/src/lib/network/network_game_manager.cc

    r9869 r9912  
    111111  playable.loadMD2Texture( playableTexture );
    112112  playable.setTeam(team);
    113   playable.loadModel( playableModel, 100.0f );
     113  playable.loadModel( playableModel, playableScale );
    114114  playable.setOwner( userId );
    115115  playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
  • branches/network/src/util/multiplayer_team_deathmatch.cc

    r9911 r9912  
    306306{
    307307  if (classId == CL_TURBINE_HOVER)
     308  {
     309    assert(false);
    308310    return "models/ships/hoverglider_mainbody.obj";
     311  }
    309312  if ( team == 0 )
    310313    return "models/creatures/doom_guy.md2";
     
    312315    return "models/creatures/male.md2";
    313316  else
     317  {
    314318    return "";
     319  }
    315320}
    316321
    317322std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, const ClassID& classId )
    318323{
    319   if ( classId == CL_FPS_PLAYER )
     324  if ( team == 0 || team == 1 )
    320325  {
    321326    if ( team == 0 )
    322       return "maps/doom_guy.png";
     327      return "doom_guy.png";
    323328    else
    324       return "maps/male_fiend.pcx";
     329      return "male_fiend.pcx";
    325330  }
    326331
     
    493498  Playable & playable = *(dynamic_cast<Playable*>(bo));
    494499
     500  PRINTF(0)("%s %s %f\n", playableModel.c_str(), playableTexture.c_str(), playableScale );
     501 
    495502  playable.loadMD2Texture( playableTexture );
    496503  playable.loadModel( playableModel, playableScale );
Note: See TracChangeset for help on using the changeset viewer.