diff options
| -rw-r--r-- | src/cgame/cg_local.h | 2 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 2 | ||||
| -rw-r--r-- | src/cgame/cg_players.c | 20 | ||||
| -rw-r--r-- | src/game/bg_public.h | 2 |
4 files changed, 10 insertions, 16 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index f6325261..366758d1 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -1260,7 +1260,7 @@ void CG_Corpse( centity_t *cent ); void CG_ResetPlayerEntity( centity_t *cent ); void CG_AddRefEntityWithPowerups( refEntity_t *ent, int powerups, int team ); void CG_NewClientInfo( int clientNum ); -void CG_PrecacheClientInfo( pClass_t class, char *model, char *skin, char *headModel, char *headSkin ); +void CG_PrecacheClientInfo( pClass_t class, char *model, char *skin ); sfxHandle_t CG_CustomSound( int clientNum, const char *soundName ); // diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 0f1308b7..cab4cda3 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -883,8 +883,6 @@ static void CG_RegisterClients( void ) for( i = PCL_NONE + 1; i < PCL_NUM_CLASSES; i++ ) { CG_PrecacheClientInfo( i, BG_FindModelNameForClass( i ), - BG_FindSkinNameForClass( i ), - BG_FindModelNameForClass( i ), BG_FindSkinNameForClass( i ) ); cg.charModelFraction = (float)i / (float)PCL_NUM_CLASSES; 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; diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 690ac0e4..71a5bfa9 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -1093,7 +1093,7 @@ int BG_FindRegenRateForClass( int pclass ); int BG_FindFovForClass( int pclass ); float BG_FindBobForClass( int pclass ); float BG_FindSpeedForClass( int pclass ); -float BG_FindAcclerationForClass( int pclass ); +float BG_FindAccelerationForClass( int pclass ); float BG_FindFrictionForClass( int pclass ); int BG_FindSteptimeForClass( int pclass ); qboolean BG_ClassHasAbility( int pclass, int ability ); |