From fd665a976411af3c7e1e0f37494efa5bc383d68d Mon Sep 17 00:00:00 2001
From: s1lentq <s1lentsk@yandex.ru>
Date: Sun, 6 Dec 2015 03:20:34 +0600
Subject: [PATCH] Cleanup. Added define CSTRIKE in build gradle

---
 regamedll/build.gradle                  | 2 +-
 regamedll/dlls/animation.cpp            | 4 ++--
 regamedll/dlls/h_battery.h              | 2 +-
 regamedll/dlls/wpn_shared/wpn_knife.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/regamedll/build.gradle b/regamedll/build.gradle
index 363ed910..19f0d8dd 100644
--- a/regamedll/build.gradle
+++ b/regamedll/build.gradle
@@ -183,7 +183,7 @@ void setupToolchain(NativeBinarySpec b)
 
 	if (!unitTestExecutable && !mpLib)
 	{
-		cfg.singleDefines 'HOOK_GAMEDLL'
+		cfg.singleDefines 'HOOK_GAMEDLL', 'CSTRIKE'
 	}
 
 	if (unitTestExecutable)
diff --git a/regamedll/dlls/animation.cpp b/regamedll/dlls/animation.cpp
index 5ec9d9ef..60bcd851 100644
--- a/regamedll/dlls/animation.cpp
+++ b/regamedll/dlls/animation.cpp
@@ -1221,9 +1221,9 @@ void SV_StudioSetupBones(model_t *pModel, float frame, int sequence, const vec_t
 
 	VectorCopy(angles, temp_angles);
 
-	if (pEdict)
+	if (pEdict != NULL)
 	{
-		temp_angles[1] = UTIL_GetPlayerGaitYaw(g_engfuncs.pfnIndexOfEdict(pEdict));
+		temp_angles[1] = UTIL_GetPlayerGaitYaw(ENTINDEX(pEdict));
 
 		if (temp_angles[1] < 0)
 			temp_angles[1] += 360.0f;
diff --git a/regamedll/dlls/h_battery.h b/regamedll/dlls/h_battery.h
index b8ec60de..38647ddf 100644
--- a/regamedll/dlls/h_battery.h
+++ b/regamedll/dlls/h_battery.h
@@ -42,7 +42,7 @@ public:
 	virtual int Restore(CRestore &restore);
 	virtual int ObjectCaps(void)
 	{
-		return ((CBaseToggle::ObjectCaps()|FCAP_CONTINUOUS_USE) & ~FCAP_ACROSS_TRANSITION);
+		return ((CBaseToggle::ObjectCaps() | FCAP_CONTINUOUS_USE) & ~FCAP_ACROSS_TRANSITION);
 	}
 	virtual void Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
 
diff --git a/regamedll/dlls/wpn_shared/wpn_knife.cpp b/regamedll/dlls/wpn_shared/wpn_knife.cpp
index 880c296a..4b170631 100644
--- a/regamedll/dlls/wpn_shared/wpn_knife.cpp
+++ b/regamedll/dlls/wpn_shared/wpn_knife.cpp
@@ -129,7 +129,7 @@ NOXREF void CKnife::WeaponAnimation(int iAnimation)
 		m_usKnife,
 		0,
 		(float *)&g_vecZero,
-		(float*)&g_vecZero,
+		(float *)&g_vecZero,
 		0,
 		0,
 		iAnimation,