Changeset 9119 in orxonox.OLD for branches/presentation/src/util

Timestamp:

Jul 4, 2006, 1:35:11 PM (19 years ago)

Author:

rennerc

Message:

added scling for playables

File:

• branches/presentation/src/util/multiplayer_team_deathmatch.cc (modified) (2 diffs)

branches/presentation/src/util/multiplayer_team_deathmatch.cc

@@ -456 +456 @@
   std::string playableModel = getPlayableModelFileName( userId, stats.getPreferedTeamId(), playableClassId );
   std::string playableTexture = getPlayableModelTextureFileName( userId, stats.getPreferedTeamId(), playableClassId );
+  float       playableScale = getPlayableScale( userId, stats.getPreferedTeamId(), playableClassId );
 
   BaseObject * bo = Factory::fabricate( playableClassId );
@@ -464 +465 @@
   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() );