* Misspelling of function prototype for BG_FindAccelerationForClass cause much

  weirdness -- but how did it ever compile?!
* Minor tidy ups to model loading stuff

1 files changed, 8 insertions, 12 deletions

diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index 8ce592b1..cfb015ac 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -667,7 +667,7 @@ static qboolean CG_ScanForExistingClientInfo( clientInfo_t *ci )
 CG_PrecacheClientInfo
 ======================
 */
-void CG_PrecacheClientInfo( pClass_t class, char *model, char *skin, char *headModel, char *headSkin )
+void CG_PrecacheClientInfo( pClass_t class, char *model, char *skin )
 {
   clientInfo_t  *ci;
   clientInfo_t  newInfo;
@@ -681,23 +681,19 @@ void CG_PrecacheClientInfo( pClass_t class, char *model, char *skin, char *headM
 
   // model
   Q_strncpyz( newInfo.modelName, model, sizeof( newInfo.modelName ) );
+  Q_strncpyz( newInfo.headModelName, model, sizeof( newInfo.headModelName ) );
 
   // modelName didn not include a skin name
   if( !skin )
+  {
     Q_strncpyz( newInfo.skinName, "default", sizeof( newInfo.skinName ) );
-  else
-    Q_strncpyz( newInfo.skinName, skin, sizeof( newInfo.skinName ) );
-
-  //CG_Printf( "PCI: %s\n", v );
-
-  // head model
-  Q_strncpyz( newInfo.headModelName, headModel, sizeof( newInfo.headModelName ) );
-
-  // modelName didn not include a skin name
-  if( !headSkin )
     Q_strncpyz( newInfo.headSkinName, "default", sizeof( newInfo.headSkinName ) );
+  }
   else
-    Q_strncpyz( newInfo.headSkinName, headSkin, sizeof( newInfo.headSkinName ) );
+  {
+    Q_strncpyz( newInfo.skinName, skin, sizeof( newInfo.skinName ) );
+    Q_strncpyz( newInfo.headSkinName, skin, sizeof( newInfo.headSkinName ) );
+  }
 
   newInfo.infoValid = qtrue;