YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-11 15:38:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix build after merge

Browse Source
This commit is contained in:
mittorn 2016-08-17 12:20:18 +00:00
parent 899cc814fb
commit 6e6d539727
5 changed files with 243 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/items.h
View File

@ -27,5 +27,6 @@ public:
return FALSE; return FALSE;
}; };
virtual float TouchGravGun( CBaseEntity *attacker, int stage); virtual float TouchGravGun( CBaseEntity *attacker, int stage);
Vector m_SpawnPoint;
}; };
#endif // ITEMS_H #endif // ITEMS_H

1
dlls/monsters.h
View File

@ -156,6 +156,7 @@ public:
return 700; return 700;
} }
float m_flNextAttack;
int m_bloodColor; int m_bloodColor;
int m_cBloodDecals; int m_cBloodDecals;
int m_material; int m_material;

1
dlls/multiplay_gamerules.cpp
View File

@ -48,7 +48,6 @@ float g_flIntermissionStartTime = 0;
#ifndef NO_VOICEGAMEMGR #ifndef NO_VOICEGAMEMGR
CVoiceGameMgr g_VoiceGameMgr; CVoiceGameMgr g_VoiceGameMgr;
#endif
class CMultiplayGameMgrHelper : public IVoiceGameMgrHelper class CMultiplayGameMgrHelper : public IVoiceGameMgrHelper
{ {

478
dlls/prop.cpp
View File

File diff suppressed because it is too large Load Diff

2
dlls/weapons.cpp
View File

@ -350,7 +350,7 @@ void W_Precache( void )
// hornetgun // hornetgun
UTIL_PrecacheOtherWeapon( "weapon_hornetgun" ); UTIL_PrecacheOtherWeapon( "weapon_hornetgun" );
#endif
UTIL_PrecacheOtherWeapon( "weapon_gravgun" ); UTIL_PrecacheOtherWeapon( "weapon_gravgun" );
UTIL_PrecacheOtherWeapon( "weapon_ar2" ); UTIL_PrecacheOtherWeapon( "weapon_ar2" );