YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-13 00:18:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge c8acbf8cd1

Browse Source
This commit is contained in:
Night Owl 2017-05-25 21:39:22 +05:00
parent 0c4a0e174e
commit 75258d19f9
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/apache.cpp
View File

@ -88,7 +88,7 @@ void CApache::Spawn( void )
pev->nextthink = gpGlobals->time + 1.0; pev->nextthink = gpGlobals->time + 1.0;
} }
m_iRockets = 10; m_iRockets = 0;
} }
void CApache::Precache( void ) void CApache::Precache( void )

4
dlls/hgrunt.cpp
View File

@ -186,6 +186,10 @@ enum
//========================================================= //=========================================================
void CHGrunt::SpeakSentence( void ) void CHGrunt::SpeakSentence( void )
{ {
// Prevent Cyberfranklin from emitting Grunt taunt sounds.
if( FClassnameIs( pev, "monster_th_cyberfranklin" ) )
return;
if( m_iSentence == HGRUNT_SENT_NONE ) if( m_iSentence == HGRUNT_SENT_NONE )
{ {
// no sentence cued up. // no sentence cued up.

8
dlls/hunger/chaingun.cpp
View File

@ -22,6 +22,8 @@
#include "player.h" #include "player.h"
#include "gamerules.h" #include "gamerules.h"
#define CHAINGUN_BULLETS_PER_SHOT 2
enum chaingun_e { enum chaingun_e {
CHAINGUN_IDLE = 0, CHAINGUN_IDLE = 0,
CHAINGUN_IDLE2, 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_iWeaponVolume = NORMAL_GUN_VOLUME;
m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH; 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; 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 vecAiming = m_pPlayer->GetAutoaimVector(AUTOAIM_5DEGREES);
Vector vecDir; 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; int flags;
#if defined( CLIENT_WEAPONS ) #if defined( CLIENT_WEAPONS )
@ -393,4 +395,4 @@ void CChaingun::StopSounds(void)
STOP_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/asscan2.wav"); STOP_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/asscan2.wav");
STOP_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/asscan3.wav"); STOP_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/asscan3.wav");
STOP_SOUND(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/asscan4.wav"); STOP_SOUND(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/asscan4.wav");
} }

4
dlls/weapons.h
View File

@ -163,7 +163,7 @@ public:
#define TRIPMINE_MAX_CLIP WEAPON_NOCLIP #define TRIPMINE_MAX_CLIP WEAPON_NOCLIP
#define SNARK_MAX_CLIP WEAPON_NOCLIP #define SNARK_MAX_CLIP WEAPON_NOCLIP
#define AP9_MAX_CLIP 40 #define AP9_MAX_CLIP 40
#define TAURUS_MAX_CLIP 10 #define TAURUS_MAX_CLIP 20
#define SNIPER_MAX_CLIP 5 #define SNIPER_MAX_CLIP 5
#define CHAINGUN_MAX_CLIP 100 #define CHAINGUN_MAX_CLIP 100
#define MEDKIT_MAX_CLIP WEAPON_NOCLIP #define MEDKIT_MAX_CLIP WEAPON_NOCLIP
@ -185,7 +185,7 @@ public:
#define SNARK_DEFAULT_GIVE 5 #define SNARK_DEFAULT_GIVE 5
#define HIVEHAND_DEFAULT_GIVE 8 #define HIVEHAND_DEFAULT_GIVE 8
#define AP9_DEFAULT_GIVE 40 #define AP9_DEFAULT_GIVE 40
#define TAURUS_DEFAULT_GIVE 10 #define TAURUS_DEFAULT_GIVE 20
#define SNIPER_DEFAULT_GIVE 5 #define SNIPER_DEFAULT_GIVE 5
#define CHAINGUN_DEFAULT_GIVE 100 #define CHAINGUN_DEFAULT_GIVE 100
#define MEDKIT_DEFAULT_GIVE 12 #define MEDKIT_DEFAULT_GIVE 12