Merge pull request #22 from erorcun/master

CPed::Avoid and needed changes

src/control/PedType.cpp

@@ -2,4 +2,31 @@
 #include "patcher.h"
 #include "PedType.h"
 
+CPedType* (&CPedType::ms_apPedType)[23] = *(CPedType * (*)[23]) * (int*)0x941594;
+
+WRAPPER void CPedType::LoadPedData(void) { EAXJMP(0x4EE8D0); }
 WRAPPER int32 CPedType::FindPedType(char* type) { EAXJMP(0x4EEC10); }
+
+void
+CPedType::Initialise()
+{
+	debug("Initialising CPedType...\n");
+	for (int i = 0; i < 23; i++) {
+		ms_apPedType[i] = new CPedType;
+		ms_apPedType[i]->m_Type.IntValue = 1;
+		ms_apPedType[i]->field_4 = 0;
+		ms_apPedType[i]->field_8 = 0;
+		// Why field_C not initialized?
+		ms_apPedType[i]->field_10 = 0;
+		ms_apPedType[i]->field_14 = 0;
+		ms_apPedType[i]->m_Threat.IntValue = 0;
+		ms_apPedType[i]->m_Avoid.IntValue = 0;
+	}
+	debug("Loading ped data...\n");
+	LoadPedData();
+	debug("CPedType ready\n");
+}
+
+STARTPATCHES
+	InjectHook(0x4EE7E0, &CPedType::Initialise, PATCH_JUMP);
+ENDPATCHES

src/control/PedType.h

@@ -1,7 +1,62 @@
 #pragma once
 
-class CPedType
+#include "common.h"
-{
+#include "templates.h"
+#include "Lists.h"
+
+class CPedType {
 public:
+	union tPedTypeFlags
+	{
+		uint32 IntValue;
+		struct
+		{
+			uint8 bPlayer1 : 1;
+			uint8 bPlayer2 : 1;
+			uint8 bPlayer3 : 1;
+			uint8 bPlayer4 : 1;
+			uint8 bCivmale : 1;
+			uint8 bCivfemale : 1;
+			uint8 bCop : 1;
+			uint8 bGang1 : 1;
+
+			uint8 bGang2 : 1;
+			uint8 bGang3 : 1;
+			uint8 bGang4 : 1;
+			uint8 bGang5 : 1;
+			uint8 bGang6 : 1;
+			uint8 bGang7 : 1;
+			uint8 bGang8 : 1;
+			uint8 bGang9 : 1;
+
+			uint8 bEmergency : 1;
+			uint8 bProstitute : 1;
+			uint8 bCriminal : 1;
+			uint8 bSpecial : 1;
+			uint8 bGun : 1;
+			uint8 bCop_car : 1;
+			uint8 bFast_car : 1;
+			uint8 bExplosion : 1;
+
+			uint8 bFireman : 1;
+			uint8 bDeadpeds : 1;
+		};
+	};
+
+	tPedTypeFlags m_Type;
+	float field_4;
+	float field_8;
+	float field_C;
+	float field_10;
+	float field_14;
+	tPedTypeFlags m_Threat;
+	tPedTypeFlags m_Avoid;
+
+	static CPedType* (&ms_apPedType)[23];
+
+	static void Initialise();
+	static void LoadPedData();
 	static int32 FindPedType(char* type);
 };
+
+static_assert(sizeof(CPedType) == 0x20, "CPedType: error");

src/entities/Ped.cpp

@@ -6,6 +6,8 @@
 #include "World.h"
 #include "DMaudio.h"
 #include "Ped.h"
+#include "PedType.h"
+#include "General.h"
 
 bool &CPed::bNastyLimbsCheat = *(bool*)0x95CD44;
 bool &CPed::bPedCheat2 = *(bool*)0x95CD5A;
@@ -228,8 +230,6 @@ CPed::AimGun()
 	}
 }
 
-
-// After I finished this I realized it's only for SCM opcode...
 void
 CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer)
 {
@@ -338,7 +338,7 @@ CPed::SetLookFlag(CPed *to, bool set)
 		m_lookTimer = 0;
 		m_ped_flagA20_look = set;
 		if (m_nPedState != PED_DRIVING) {
-			m_pedIK.m_flags &= ~CPedIK::FLAG_4;
+			m_pedIK.m_flags &= ~CPedIK::FLAG_2;
 		}
 	}
 }
@@ -354,7 +354,7 @@ CPed::SetLookFlag(float angle, bool set)
 		m_lookTimer = 0;
 		m_ped_flagA20_look = set;
 		if (m_nPedState != PED_DRIVING) {
-			m_pedIK.m_flags &= ~CPedIK::FLAG_4;
+			m_pedIK.m_flags &= ~CPedIK::FLAG_2;
 		}
 	}
 }
@@ -370,8 +370,6 @@ CPed::SetLookTimer(int time)
 bool
 CPed::OurPedCanSeeThisOne(CEntity* who)
 {
-	float xDiff;
-	float yDiff;
 	float distance;
 	CColPoint colpoint;
 	CEntity* ent;
@@ -381,13 +379,15 @@ CPed::OurPedCanSeeThisOne(CEntity* who)
 	ourPos = this->GetPosition();
 	itsPos = who->GetPosition();
 
-	xDiff = itsPos.x - ourPos.x;
+	CVector2D posDiff(
-	yDiff = itsPos.y - ourPos.y;
+		itsPos.x - ourPos.x,
+		itsPos.y - ourPos.y
+	);
 
-	if ((yDiff * this->GetUp().y) + (xDiff * this->GetUp().x) < 0.0f)
+	if ((posDiff.y * this->GetForward().y) + (posDiff.x * this->GetForward().x) < 0.0f)
 		return 0;
 
-	distance = sqrt(yDiff * yDiff + xDiff * xDiff);
+	distance = posDiff.Magnitude();
 
 	if (distance < 40.0f)
 		return 0;
@@ -396,6 +396,58 @@ CPed::OurPedCanSeeThisOne(CEntity* who)
 	return !CWorld::ProcessLineOfSight(ourPos, itsPos, colpoint, ent, 1, 0, 0, 0, 0, 0, 0);
 }
 
+void
+CPed::Avoid(void) {
+	int8 temper;
+	int moveState;
+	CPed* nearestPed;
+	float walkAngle;
+	float distance;
+
+	temper = m_pedStats->m_temper;
+	if ((temper <= m_pedStats->m_fear || temper <= 50) && CTimer::GetTimeInMilliseconds() > m_nPedStateTimer) {
+		moveState = m_nMoveState;
+
+		if (moveState != PEDMOVE_NONE && moveState != PEDMOVE_STILL) {
+			nearestPed = m_nearPeds[0];
+
+			if (nearestPed) {
+				if (nearestPed->m_nPedState != PED_DEAD && nearestPed != m_pSeekTarget && nearestPed != m_field_16C
+					&& (CPedType::ms_apPedType[nearestPed->m_nPedType]->m_Type.IntValue
+						& CPedType::ms_apPedType[this->m_nPedType]->m_Avoid.IntValue)) {
+
+					// Further codes checks whether the distance between us and ped will be equal or below 1.0, if we walk up to him by 1.25 meters.
+					// If so, we want to avoid it, so we turn our body 45 degree and look to somewhere else.
+
+					walkAngle = RADTODEG(m_fRotationCur) / RADTODEG(1);
+
+					// Original code was multiplying sin/cos with the number below, which is pointless because it's always 1.
+					// ratio = 1.0f / sqrt(sin*sin + cos*cos);
+
+					CVector2D walkedUpToPed(
+						nearestPed->GetPosition().x - (1.25 * -sin(walkAngle) + GetPosition().x),
+						nearestPed->GetPosition().y - (1.25 * cos(walkAngle) + GetPosition().y)
+					);
+
+					distance = walkedUpToPed.Magnitude();
+
+					if (distance <= 1.0f && CPed::OurPedCanSeeThisOne((CEntity*)nearestPed)) {
+						m_nPedStateTimer = CTimer::GetTimeInMilliseconds()
+							+ 500 + (m_randomSeed + 3 * CTimer::GetFrameCounter())
+							% 1000 / 5;
+
+						m_fRotationDest += DEGTORAD(45.0f);
+						if (!m_ped_flagA10) {
+							CPed::SetLookFlag(nearestPed, 0);
+							CPed::SetLookTimer(CGeneral::GetRandomNumberInRange(0, 300) + 500);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 STARTPATCHES
 	InjectHook(0x4CF8F0, &CPed::AddWeaponModel, PATCH_JUMP);
 	InjectHook(0x4C6AA0, &CPed::AimGun, PATCH_JUMP);
@@ -405,4 +457,5 @@ STARTPATCHES
 	InjectHook(0x4C63E0, (void (CPed::*)(float, bool)) &CPed::SetLookFlag, PATCH_JUMP);
 	InjectHook(0x4D12E0, &CPed::SetLookTimer, PATCH_JUMP);
 	InjectHook(0x4C5700, &CPed::OurPedCanSeeThisOne, PATCH_JUMP);
+	InjectHook(0x4D2BB0, &CPed::Avoid, PATCH_JUMP);
 ENDPATCHES

src/entities/Ped.h

@@ -3,10 +3,10 @@
 #include "Physical.h"
 #include "Weapon.h"
 #include "PedIK.h"
+#include "PedStats.h"
 #include "AnimManager.h"
 #include "AnimBlendClumpData.h"
 
-struct PedStat;
 struct CPathNode;
 
 enum {
@@ -95,9 +95,9 @@ public:
 	float m_fCollisionSpeed;
 	uint8 m_ped_flagA1 : 1;
 	uint8 m_ped_flagA2 : 1;
-	uint8 m_ped_flagA4 : 1;
+	uint8 m_ped_flagA4 : 1;		// stores (CTimer::GetTimeInMilliseconds() < m_lastHitTime)
 	uint8 m_ped_flagA8 : 1;
-	uint8 m_ped_flagA10 : 1;
+	uint8 m_ped_flagA10 : 1;	// set when A20 just changed?
 	uint8 m_ped_flagA20_look : 1;
 	uint8 m_ped_flagA40 : 1;
 	uint8 m_ped_flagA80 : 1;
@@ -114,7 +114,7 @@ public:
 	uint8 m_ped_flagC4 : 1;
 	uint8 m_ped_flagC8 : 1;
 	uint8 m_ped_flagC10 : 1;
-	uint8 m_ped_flagC20 : 1;
+	uint8 m_ped_flagC20 : 1;	// just left some body part?
 	uint8 m_ped_flagC40 : 1;
 	uint8 m_ped_flagC80 : 1;
 	uint8 m_ped_flagD1 : 1;
@@ -129,7 +129,7 @@ public:
 	uint8 m_ped_flagE2 : 1;
 	uint8 m_ped_flagE4 : 1;
 	uint8 m_ped_flagE8 : 1;
-	uint8 m_ped_flagE10 : 1;
+	uint8 m_ped_flagE10 : 1;	// can't attack if it's set
 	uint8 m_ped_flagE20 : 1;
 	uint8 m_ped_flagE40 : 1;
 	uint8 m_ped_flagE80 : 1;
@@ -166,7 +166,7 @@ public:
 	uint8 m_ped_flagI40 : 1;
 	uint8 m_ped_flagI80 : 1;
 	uint8 stuff10[15];
-	int32 m_field_16C;
+	CPed *m_field_16C;
 	uint8 stuff12[44];
 	int32 m_pEventEntity;
 	float m_fAngleToEvent;
@@ -198,7 +198,10 @@ public:
 	CPathNode *m_pLastPathNode;
 	float m_fHealth;
 	float m_fArmour;
-	uint8 stuff2[34];
+	uint8 stuff2[20];
+	float m_fRotationCur;
+	float m_fRotationDest;
+	uint8 stuff13[6];
 	CEntity *m_pCurrentPhysSurface;
 	CVector m_vecOffsetFromPhysSurface;
 	CEntity *m_pCurSurface;
@@ -225,7 +228,10 @@ public:
 	uint32 m_leaveCarTimer;
 	uint32 m_getUpTimer;
 	uint32 m_lookTimer;
-	uint8 stuff9[34];
+	uint32 m_standardTimer;
+	uint32 m_attackTimer;
+	uint32 m_lastHitTime;
+	uint8 stuff9[22];
 	uint8 m_bodyPartBleeding;
 	uint8 m_field_4F3;
 	CPed *m_nearPeds[10];
@@ -249,6 +255,7 @@ public:
 	void RemoveBodyPart(PedNode nodeId, int8 unknown);
 	void SpawnFlyingComponent(int, int8 unknown);
 	bool OurPedCanSeeThisOne(CEntity* who);
+	void Avoid(void);
 	static RwObject *SetPedAtomicVisibilityCB(RwObject *object, void *data);
 	static RwFrame *RecurseFrameChildrenVisibilityCB(RwFrame *frame, void *data);
 

src/entities/PedIK.h

@@ -16,7 +16,7 @@ public:
 	enum {
 		FLAG_1,
 		FLAG_2,
-		FLAG_4,
+		FLAG_4,	// aims with arm
 	};
 
 	CPed* m_ped;

src/entities/PlayerPed.h

@@ -19,7 +19,7 @@ public:
 	int32 m_nSpeedTimer;
 	int32 m_nShotDelay;
 	float field_1376;
-	int8 field_1380;
+	int8 field_1380;	// set if can't attack, why?
 	int8 field_1381;
 	int8 field_1382;
 	int8 field_1383;