Changeset 9117 in orxonox.OLD

Timestamp:

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

Author:

rennerc

Message:

player joins game with last chosen nickname

Location:

branches/presentation/src

Files:

• lib/network/network_game_manager.cc (modified) (2 diffs)
• util/multiplayer_team_deathmatch.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.h (modified) (1 diff)
• util/network_game_rules.cc (modified) (1 diff)
• util/network_game_rules.h (modified) (1 diff)

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() );

branches/presentation/src/util/multiplayer_team_deathmatch.cc

@@ -792 +792 @@
 }
 
+float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, ClassID classId )
+{
+  if ( classId == CL_FPS_PLAYER )
+  {
+    return 10.0f;
+  }
+  
+  return 1.0f;
+}

branches/presentation/src/util/multiplayer_team_deathmatch.h

@@ -41 +41 @@
     virtual std::string getPlayableModelTextureFileName( int userId, int team, ClassID classId );
     virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
+    virtual float getPlayableScale( int userId, int team, ClassID classId );
 
     virtual void registerSpawn( WorldEntity * we );

branches/presentation/src/util/network_game_rules.cc

@@ -68 +68 @@
 
 
+float NetworkGameRules::getPlayableScale( int userId, int team, ClassID classId )
+{
+  return 1.0f;
+}

branches/presentation/src/util/network_game_rules.h

@@ -24 +24 @@
     virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
     virtual std::string getPlayableModelTextureFileName( int userId, int team, ClassID classId );
+    virtual float getPlayableScale( int userId, int team, ClassID classId );
     
     virtual PlayerStats * getNewPlayerStats( int userId ){ return new PlayerStats( userId ); }