Changeset 9068 in orxonox.OLD for branches/presentation/src/lib

Timestamp:

Jul 3, 2006, 8:55:53 PM (19 years ago)

Author:

rennerc

Message:

removed some bugs and added texture sync

Location:

branches/presentation/src/lib

Files:

• network/network_game_manager.cc (modified) (2 diffs)
• network/shared_network_data.cc (modified) (1 diff)
• util/loading/game_loader.cc (modified) (1 diff)

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

@@ -98 +98 @@
   ClassID playableClassId = rules.getPlayableClassId( userId, team );
   std::string playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
+  std::string playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
   
   BaseObject * bo = Factory::fabricate( playableClassId );
@@ -106 +107 @@
   Playable & playable = *(dynamic_cast<Playable*>(bo));
   
-  if (  playableModel != "" )
+  if ( playableTexture != "" )
+    playable.loadMD2Texture( playableTexture );
+  if ( playableModel != "" )
     playable.loadModel( playableModel );
   playable.setOwner( userId );

branches/presentation/src/lib/network/shared_network_data.cc

@@ -44 +44 @@
  */
 SharedNetworkData::~SharedNetworkData()
-{}
+{
+  SharedNetworkData::singletonRef = NULL;
+}

branches/presentation/src/lib/util/loading/game_loader.cc

@@ -57 +57 @@
     delete this->currentCampaign;
   this->currentCampaign = NULL;
+  
+  GameLoader::singletonRef = NULL;
 }