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

Timestamp:

Jul 4, 2006, 1:21:19 PM (18 years ago)

Author:

rennerc

Message:

player joins game with last chosen nickname

File:

• branches/presentation/src/lib/network/network_game_manager.cc (modified) (2 diffs)

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

@@ -101 +101 @@
   std::string playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
   std::string playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
+  float       playableScale = rules.getPlayableScale( userId, team, playableClassId );
   
   BaseObject * bo = Factory::fabricate( playableClassId );
@@ -109 +110 @@
   Playable & playable = *(dynamic_cast<Playable*>(bo));
   
-  if ( playableTexture != "" )
-    playable.loadMD2Texture( playableTexture );
-  if ( playableModel != "" )
-    playable.loadModel( playableModel );
+  playable.loadMD2Texture( playableTexture );
+  
+  playable.loadModel( playableModel, playableScale );
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );