Update CSSDK

rehlds · May 4, 2017 · 39ef08f · 39ef08f
1 parent 1733dde
commit 39ef08f
Show file tree

Hide file tree

Showing 24 changed files with 427 additions and 193 deletions.
diff --git a/include/cssdk/common/const.h b/include/cssdk/common/const.h
@@ -71,6 +71,9 @@
 #define FL_KILLME				(1<<30)	// This entity is marked for death -- This allows the engine to kill ents at the appropriate time
 #define FL_DORMANT				(1<<31)	// Entity is dormant, no updates to client
 
+// SV_EmitSound2 flags
+#define SND_EMIT2_NOPAS			(1<<0)	// never to do check PAS
+#define SND_EMIT2_INVOKER		(1<<1)	// do not send to the client invoker
 
 // Engine edict->spawnflags
 #define SF_NOTINDEATHMATCH		0x0800	// Do not spawn when deathmatch and loading entities from a file

diff --git a/include/cssdk/dlls/basemonster.h b/include/cssdk/dlls/basemonster.h
@@ -49,8 +49,8 @@ class CBaseMonster: public CBaseToggle {
 public:
 	virtual void KeyValue(KeyValueData *pkvd) = 0;
 	virtual void TraceAttack(entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType) = 0;
-	virtual int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
-	virtual int TakeHealth(float flHealth, int bitsDamageType) = 0;
+	virtual BOOL TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
+	virtual BOOL TakeHealth(float flHealth, int bitsDamageType) = 0;
 	virtual void Killed(entvars_t *pevAttacker, int iGib) = 0;
 	virtual int BloodColor() = 0;
 	virtual BOOL IsAlive() = 0;

diff --git a/include/cssdk/dlls/bot/cs_bot.h b/include/cssdk/dlls/bot/cs_bot.h
@@ -281,7 +281,7 @@ class UseEntityState: public BotState {
 // The Counter-strike Bot
 class CCSBot: public CBot {
 public:
-	virtual int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;		// invoked when injured by something (EXTEND) - returns the amount of damage inflicted
+	virtual BOOL TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;		// invoked when injured by something (EXTEND) - returns the amount of damage inflicted
 	virtual void Killed(entvars_t *pevAttacker, int iGib) = 0;									// invoked when killed (EXTEND)
 	virtual void RoundRespawn() = 0;
 	virtual void Blind(float duration, float holdTime, float fadeTime, int alpha = 255) = 0;					// player blinded by a flashbang

diff --git a/include/cssdk/dlls/buttons.h b/include/cssdk/dlls/buttons.h
@@ -99,6 +99,6 @@ class CButtonTarget: public CBaseEntity {
 public:
 	virtual void Spawn() = 0;
 	virtual int ObjectCaps() = 0;
-	virtual int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
+	virtual BOOL TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
 	virtual void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value) = 0;
 };
diff --git a/include/cssdk/dlls/cbase.h b/include/cssdk/dlls/cbase.h
@@ -68,8 +68,8 @@ class CBaseEntity {
 	virtual void DeathNotice(entvars_t *pevChild) = 0;
 
 	virtual void TraceAttack(entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType) = 0;
-	virtual int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
-	virtual int TakeHealth(float flHealth, int bitsDamageType) = 0;
+	virtual BOOL TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
+	virtual BOOL TakeHealth(float flHealth, int bitsDamageType) = 0;
 	virtual void Killed(entvars_t *pevAttacker, int iGib) = 0;
 	virtual int BloodColor() = 0;
 	virtual void TraceBleed(float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType) = 0;
@@ -268,7 +268,7 @@ class CBaseButton: public CBaseToggle {
 	virtual void Spawn() = 0;
 	virtual void Precache() = 0;
 	virtual void KeyValue(KeyValueData *pkvd) = 0;
-	virtual int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
+	virtual BOOL TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
 	virtual int Save(CSave &save) = 0;
 	virtual int Restore(CRestore &restore) = 0;
 	virtual int ObjectCaps() = 0;		// Buttons that don't take damage can be IMPULSE used

diff --git a/include/cssdk/dlls/func_break.h b/include/cssdk/dlls/func_break.h
@@ -77,7 +77,7 @@ class CBreakable: public CBaseDelay {
 	virtual void TraceAttack(entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType) = 0;
 
 	// breakables use an overridden takedamage
-	virtual int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
+	virtual BOOL TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
 
 	virtual int DamageDecal(int bitsDamageType) = 0;
 	virtual void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value) = 0;
@@ -105,7 +105,7 @@ class CPushable: public CBreakable {
 	virtual int Save(CSave &save) = 0;
 	virtual int Restore(CRestore &restore) = 0;
 	virtual int ObjectCaps() = 0
-	virtual int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
+	virtual BOOL TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType) = 0;
 	virtual void Touch(CBaseEntity *pOther) = 0;
 	virtual void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value) = 0;