diff --git a/Hunger/dlls/Hunger/chaingun.cpp b/Hunger/dlls/Hunger/chaingun.cpp index 6140a40f9..b663186ce 100644 --- a/Hunger/dlls/Hunger/chaingun.cpp +++ b/Hunger/dlls/Hunger/chaingun.cpp @@ -22,6 +22,8 @@ #include "player.h" #include "gamerules.h" +#define CHAINGUN_BULLETS_PER_SHOT 2 + enum chaingun_e { CHAINGUN_IDLE = 0, CHAINGUN_IDLE2, @@ -357,7 +359,7 @@ void CChaingun::Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim) m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME; m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH; - m_iClip--; + m_iClip -= CHAINGUN_BULLETS_PER_SHOT; m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH; @@ -368,7 +370,7 @@ void CChaingun::Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim) Vector vecAiming = m_pPlayer->GetAutoaimVector(AUTOAIM_5DEGREES); Vector vecDir; - vecDir = m_pPlayer->FireBulletsPlayer(1, vecSrc, vecAiming, Vector(flSpread, flSpread, flSpread), 8192, BULLET_PLAYER_CHAINGUN, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed); + vecDir = m_pPlayer->FireBulletsPlayer(CHAINGUN_BULLETS_PER_SHOT, vecSrc, vecAiming, Vector(flSpread, flSpread, flSpread), 8192, BULLET_PLAYER_CHAINGUN, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed); int flags; #if defined( CLIENT_WEAPONS ) diff --git a/Hunger/dlls/apache.cpp b/Hunger/dlls/apache.cpp index c29ab602a..120df557b 100644 --- a/Hunger/dlls/apache.cpp +++ b/Hunger/dlls/apache.cpp @@ -157,7 +157,11 @@ void CApache :: Spawn( void ) pev->nextthink = gpGlobals->time + 1.0; } +#if defined ( HUNGER_DLL ) + m_iRockets = 0; +#else m_iRockets = 10; +#endif } diff --git a/Hunger/dlls/egon.cpp b/Hunger/dlls/egon.cpp index 1fbf8ea62..a29f406e2 100644 --- a/Hunger/dlls/egon.cpp +++ b/Hunger/dlls/egon.cpp @@ -560,10 +560,13 @@ void CEgon::WeaponIdle( void ) { ResetEmptySound( ); +#if defined ( HUNGER_DLL ) || defined ( HUNGER_CLIENT_DLL ) + if ( m_flTimeWeaponIdle > UTIL_WeaponTimeBase() ) + return; +#else if ( m_flTimeWeaponIdle > gpGlobals->time ) return; -#if !defined ( HUNGER_DLL ) && !defined ( HUNGER_CLIENT_DLL ) if ( m_fireState != FIRE_OFF ) EndAttack(); #endif // !defined ( HUNGER_DLL ) && !defined ( HUNGER_CLIENT_DLL ) diff --git a/Hunger/dlls/hgrunt.cpp b/Hunger/dlls/hgrunt.cpp index 65f0cdd69..09d0f09f9 100644 --- a/Hunger/dlls/hgrunt.cpp +++ b/Hunger/dlls/hgrunt.cpp @@ -264,6 +264,12 @@ enum //========================================================= void CHGrunt :: SpeakSentence( void ) { +#if defined ( HUNGER_DLL ) + // Prevent Cyberfranklin from emitting Grunt taunt sounds. + if ( FClassnameIs( pev, "monster_th_cyberfranklin" ) ) + return; +#endif + if ( m_iSentence == HGRUNT_SENT_NONE ) { // no sentence cued up. diff --git a/Hunger/dlls/weapons.h b/Hunger/dlls/weapons.h index f7076b96b..1e4bf830b 100644 --- a/Hunger/dlls/weapons.h +++ b/Hunger/dlls/weapons.h @@ -175,7 +175,7 @@ class CTnt : public CGrenade #define SNARK_MAX_CLIP WEAPON_NOCLIP #if defined ( HUNGER_DLL ) || defined ( HUNGER_CLIENT_DLL ) #define AP9_MAX_CLIP 40 -#define TAURUS_MAX_CLIP 10 +#define TAURUS_MAX_CLIP 20 #define SNIPER_MAX_CLIP 5 #define CHAINGUN_MAX_CLIP 100 #define MEDKIT_MAX_CLIP WEAPON_NOCLIP @@ -200,7 +200,7 @@ class CTnt : public CGrenade #define HIVEHAND_DEFAULT_GIVE 8 #if defined ( HUNGER_DLL ) || defined ( HUNGER_CLIENT_DLL ) #define AP9_DEFAULT_GIVE 40 -#define TAURUS_DEFAULT_GIVE 10 +#define TAURUS_DEFAULT_GIVE 20 #define SNIPER_DEFAULT_GIVE 5 #define CHAINGUN_DEFAULT_GIVE 100 #define MEDKIT_DEFAULT_GIVE 12