diff --git a/cl_dll/ev_hldm.cpp b/cl_dll/ev_hldm.cpp index d612a651..d38a0824 100644 --- a/cl_dll/ev_hldm.cpp +++ b/cl_dll/ev_hldm.cpp @@ -420,7 +420,7 @@ void EV_HLDM_FireBullets( int idx, float *forward, float *right, float *up, int gEngfuncs.pEventAPI->EV_SetSolidPlayers( idx - 1 ); gEngfuncs.pEventAPI->EV_SetTraceHull( 2 ); - gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr ); + gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_NORMAL, -1, &tr ); tracer = EV_HLDM_CheckTracer( idx, vecSrc, tr.endpos, forward, right, iBulletType, iTracerFreq, tracerCount ); @@ -883,7 +883,7 @@ void EV_FireGauss( event_args_t *args ) gEngfuncs.pEventAPI->EV_SetSolidPlayers( idx - 1 ); gEngfuncs.pEventAPI->EV_SetTraceHull( 2 ); - gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecDest, PM_STUDIO_BOX, -1, &tr ); + gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecDest, PM_NORMAL, -1, &tr ); gEngfuncs.pEventAPI->EV_PopPMStates(); @@ -1004,14 +1004,14 @@ void EV_FireGauss( event_args_t *args ) gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 ); gEngfuncs.pEventAPI->EV_SetTraceHull( 2 ); - gEngfuncs.pEventAPI->EV_PlayerTrace( start, vecDest, PM_STUDIO_BOX, -1, &beam_tr ); + gEngfuncs.pEventAPI->EV_PlayerTrace( start, vecDest, PM_NORMAL, -1, &beam_tr ); if( !beam_tr.allsolid ) { vec3_t delta; // trace backwards to find exit point - gEngfuncs.pEventAPI->EV_PlayerTrace( beam_tr.endpos, tr.endpos, PM_STUDIO_BOX, -1, &beam_tr ); + gEngfuncs.pEventAPI->EV_PlayerTrace( beam_tr.endpos, tr.endpos, PM_NORMAL, -1, &beam_tr ); VectorSubtract( beam_tr.endpos, tr.endpos, delta ); @@ -1214,7 +1214,7 @@ void EV_FireCrossbow2( event_args_t *args ) // Now add in all of the players. gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 ); gEngfuncs.pEventAPI->EV_SetTraceHull( 2 ); - gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr ); + gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_NORMAL, -1, &tr ); //We hit something if( tr.fraction < 1.0f ) @@ -1450,7 +1450,7 @@ void EV_EgonFire( event_args_t *args ) gEngfuncs.pEventAPI->EV_SetSolidPlayers( idx - 1 ); gEngfuncs.pEventAPI->EV_SetTraceHull( 2 ); - gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr ); + gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_NORMAL, -1, &tr ); gEngfuncs.pEventAPI->EV_PopPMStates(); diff --git a/dlls/hornetgun.cpp b/dlls/hornetgun.cpp index 4223ddd6..f43adfd2 100644 --- a/dlls/hornetgun.cpp +++ b/dlls/hornetgun.cpp @@ -252,7 +252,7 @@ void CHgun::Reload( void ) while( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] < HORNET_MAX_CARRY && m_flRechargeTime < gpGlobals->time ) { m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]++; - m_flRechargeTime += 0.5f; + m_flRechargeTime += 0.3f; } } diff --git a/dlls/multiplay_gamerules.cpp b/dlls/multiplay_gamerules.cpp index e8e6a3b5..b9f35d41 100644 --- a/dlls/multiplay_gamerules.cpp +++ b/dlls/multiplay_gamerules.cpp @@ -149,7 +149,7 @@ void CHalfLifeMultiplay::RefreshSkillData( void ) gSkillData.plrDmg9MM = 12; // 357 Round - gSkillData.plrDmg357 = 40; + gSkillData.plrDmg357 = 50; // MP5 Round gSkillData.plrDmgMP5 = 12; diff --git a/dlls/util.h b/dlls/util.h index 6e3b2cca..ad3d8002 100644 --- a/dlls/util.h +++ b/dlls/util.h @@ -498,7 +498,7 @@ extern DLL_GLOBAL int g_Language; // sentence groups #define CBSENTENCENAME_MAX 16 -#define CVOXFILESENTENCEMAX 1536 // max number of sentences in game. NOTE: this must match +#define CVOXFILESENTENCEMAX 2048 // max number of sentences in game. NOTE: this must match // CVOXFILESENTENCEMAX in engine\sound.h!!! extern char gszallsentencenames[CVOXFILESENTENCEMAX][CBSENTENCENAME_MAX]; diff --git a/dlls/weapons.h b/dlls/weapons.h index c20bc6eb..68664c75 100644 --- a/dlls/weapons.h +++ b/dlls/weapons.h @@ -144,7 +144,7 @@ public: #define GLOCK_DEFAULT_GIVE 17 #define BIGLOLLY_GLOCK_DEFAULT_GIVE 30 #define PYTHON_DEFAULT_GIVE 6 -#define MP5_DEFAULT_GIVE 25 +#define MP5_DEFAULT_GIVE 50 #define MP5_M203_DEFAULT_GIVE 0 #define SHOTGUN_DEFAULT_GIVE 12 #define CROSSBOW_DEFAULT_GIVE 5