diff options
Diffstat (limited to 'mp/src/game/client/cdll_client_int.cpp')
| -rw-r--r-- | mp/src/game/client/cdll_client_int.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/mp/src/game/client/cdll_client_int.cpp b/mp/src/game/client/cdll_client_int.cpp index 10cce078..5b8f10d9 100644 --- a/mp/src/game/client/cdll_client_int.cpp +++ b/mp/src/game/client/cdll_client_int.cpp @@ -141,6 +141,7 @@ #if defined( TF_CLIENT_DLL ) #include "econ/tool_items/custom_texture_cache.h" + #endif #ifdef WORKSHOP_IMPORT_ENABLED @@ -568,7 +569,8 @@ void DisplayBoneSetupEnts() if ( pEnt->m_Count >= 3 ) { printInfo.color[0] = 1; - printInfo.color[1] = printInfo.color[2] = 0; + printInfo.color[1] = 0; + printInfo.color[2] = 0; } else if ( pEnt->m_Count == 2 ) { @@ -578,7 +580,9 @@ void DisplayBoneSetupEnts() } else { - printInfo.color[0] = printInfo.color[0] = printInfo.color[0] = 1; + printInfo.color[0] = 1; + printInfo.color[1] = 1; + printInfo.color[2] = 1; } engine->Con_NXPrintf( &printInfo, "%25s / %3d / %3d", pEnt->m_ModelName, pEnt->m_Count, pEnt->m_Index ); printInfo.index++; @@ -2561,8 +2565,8 @@ void CHLClient::ClientAdjustStartSoundParams( StartSoundParams_t& params ) // Halloween voice futzery? else { - float flHeadScale = 1.f; - CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( pEntity, flHeadScale, head_scale ); + float flVoicePitchScale = 1.f; + CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( pEntity, flVoicePitchScale, voice_pitch_scale ); int iHalloweenVoiceSpell = 0; CALL_ATTRIB_HOOK_INT_ON_OTHER( pEntity, iHalloweenVoiceSpell, halloween_voice_modulation ); @@ -2570,17 +2574,9 @@ void CHLClient::ClientAdjustStartSoundParams( StartSoundParams_t& params ) { params.pitch *= 0.8f; } - else if( flHeadScale != 1.f ) + else if( flVoicePitchScale != 1.f ) { - // Big head, deep voice - if( flHeadScale > 1.f ) - { - params.pitch *= 0.8f; - } - else // Small head, high voice - { - params.pitch *= 1.3f; - } + params.pitch *= flVoicePitchScale; } } } |