Merge pull request #266 from erorcun/erorcun

Peds & a few fixes
GTAmodding · Nov 5, 2019 · 996bc0293f9ae35f28dbf88b9fabdb33dda3d411 · 996bc02
2 parents 11d071a + d5619fb
commit 996bc0293f9ae35f28dbf88b9fabdb33dda3d411
Unified Split

Showing with 387 additions and 28 deletions.

+1 −0 src/core/re3.cpp

+10 −3 src/math/Vector2D.h

+364 −17 src/peds/Ped.cpp

+9 −5 src/peds/Ped.h

+3 −3 src/vehicles/Automobile.cpp
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
@@ -354,6 +354,7 @@ DebugMenuPopulate(void)
 #ifndef MASTER
 		DebugMenuAddVarBool8("Debug", "Toggle unused fight feature", (int8*)&CPed::bUnusedFightThingOnPlayer, nil);
 		DebugMenuAddVarBool8("Debug", "Toggle banned particles", (int8*)&CParticle::bEnableBannedParticles, nil);
+		DebugMenuAddVarBool8("Debug", "Toggle popping heads on headshot", (int8*)&CPed::bPopHeadsOnHeadshot, nil);
 #endif
 
 		DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);

diff --git a/src/math/Vector2D.h b/src/math/Vector2D.h
@@ -49,9 +49,6 @@ class CVector2D
 	CVector2D operator+(const CVector2D &rhs) const {
 		return CVector2D(x+rhs.x, y+rhs.y);
 	}
-	CVector2D operator*(float t) const {
-		return CVector2D(x*t, y*t);
-	}
 	CVector2D operator/(float t) const {
 		return CVector2D(x/t, y/t);
 	}
@@ -91,3 +88,13 @@ NormalizeXY(float &x, float &y)
 	}else
 		x = 1.0f;
 }
+
+inline CVector2D operator*(const CVector2D &left, float right)
+{
+	return CVector2D(left.x * right, left.y * right);
+}
+
+inline CVector2D operator*(float left, const CVector2D &right)
+{
+	return CVector2D(left * right.x, left * right.y);
+}