Changeset 9912 in orxonox.OLD

Timestamp:

Nov 2, 2006, 4:34:52 PM (17 years ago)

Author:

rennerc

Message:

still not working

Location:

branches/network/src

Files:

• lib/graphics/importer/md2/md2Model.cc (modified) (1 diff)
• lib/graphics/importer/md2/resource_md2.cc (modified) (2 diffs)
• lib/lang/base_object.cc (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (3 diffs)

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

@@ -452 +452 @@
   this->loadModel(modelFileName);
   this->loadSkin(skinFileName);
+  
+  PRINTF(0)("model %s, skin %s\n", modelFileName.c_str(), skinFileName.c_str());
 }
 

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

@@ -10 +10 @@
 {
   Resources::StorePointer* ptr = this->acquireResource(loadString(modelName, skinName, scale));
-
+  
   if (ptr)
   {
@@ -20 +20 @@
     PRINTF(0)("NOT FOUND MD2: %s\n", modelName.c_str());
     std::string modelFileName = this->Resource::locateFile(modelName);
-    //std::string skinFileName = this->Resource::locateFile(skinName);
+    std::string skinFileName = this->Resource::locateFile(skinName);
+    PRINTF(0)("NEW %s::%s\n", modelName.c_str(), modelFileName.c_str());
     this->MD2Model::load(modelFileName, skinName, scale);
-    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), keepLevel, this->MD2Model::dataPointer()));
+    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinFileName, scale), keepLevel, this->MD2Model::dataPointer()));
   }
 

branches/network/src/lib/lang/base_object.cc

@@ -45 +45 @@
   for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
   {
-    if (ORX_DEBUG >= 5)
+    //if (ORX_DEBUG >= 5)
       assert((*it)._objectList->checkIteratorInList((*it)._iterator) || (*it)._objectList->checkObjectInList(this));
     (*it)._objectList->unregisterObject((*it)._iterator);

branches/network/src/lib/network/network_game_manager.cc

@@ -111 +111 @@
   playable.loadMD2Texture( playableTexture );
   playable.setTeam(team);
-  playable.loadModel( playableModel, 100.0f );
+  playable.loadModel( playableModel, playableScale );
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -306 +306 @@
 {
   if (classId == CL_TURBINE_HOVER)
+  {
+    assert(false);
     return "models/ships/hoverglider_mainbody.obj";
+  }
   if ( team == 0 )
     return "models/creatures/doom_guy.md2";
@@ -312 +315 @@
     return "models/creatures/male.md2";
   else
+  {
     return "";
+  }
 }
 
 std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, const ClassID& classId )
 {
-  if ( classId == CL_FPS_PLAYER )
+  if ( team == 0 || team == 1 )
   {
     if ( team == 0 )
-      return "maps/doom_guy.png";
+      return "doom_guy.png";
     else
-      return "maps/male_fiend.pcx";
+      return "male_fiend.pcx";
   }
 
@@ -493 +498 @@
   Playable & playable = *(dynamic_cast<Playable*>(bo));
 
+  PRINTF(0)("%s %s %f\n", playableModel.c_str(), playableTexture.c_str(), playableScale );
+  
   playable.loadMD2Texture( playableTexture );
   playable.loadModel( playableModel, playableScale );