From 864847a6fe5461581232a68b64d98dd15d035330 Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Fri, 22 May 2020 02:42:04 +0300
Subject: new script commands - mostly stubs

---
 src/peds/Ped.cpp | 15 +++++++++++++--
 src/peds/Ped.h   | 22 +++++++++++-----------
 2 files changed, 24 insertions(+), 13 deletions(-)

(limited to 'src/peds')

diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 539bbfaf..081ea91e 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -603,14 +603,25 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	bCarPassenger = false;
 	bMiamiViceCop = false;
 	bMoneyHasBeenGivenByScript = false;
+	bHasBeenPhotographed = false;
 
 	bIsDrowning = false;
-	bCanDrownInWater = true;
+	bDrownsInWater = true;
 #ifdef VC_PED_PORTS
 	bHeadStuckInCollision = false;
 #endif
 	bIsPlayerFriend = true;
 	bDeadPedInFrontOfCar = false;
+	bStayInCarOnJack = false;
+
+	bDontFight = false;
+	bDoomAim = true;
+	bCanBeShotInVehicle = true;
+	bIgnoreThreatsBehindObjects = false;
+
+	bNeverEverTargetThisPed = false;
+
+	bBoughtIceCream = false;
 
 	if ((CGeneral::GetRandomNumber() & 3) == 0)
 		bHasACamera = true;
@@ -4116,7 +4127,7 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 	if (DyingOrDead())
 		return false;
 
-	if (method == WEAPONTYPE_DROWNING && !bCanDrownInWater)
+	if (method == WEAPONTYPE_DROWNING && !bDrownsInWater)
 		return false;
 
 	if (!bUsesCollision && (!bInVehicle || m_nPedState != PED_DRIVING) && method != WEAPONTYPE_DROWNING)
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 4452c13a..0cbf5701 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -225,10 +225,10 @@ enum eObjective : uint32 {
 	OBJECTIVE_USE_STOP_ATTRACTOR,
 	OBJECTIVE_USE_PIZZA_ATTRACTOR,
 	OBJECTIVE_USE_SHELTER_ATTRACTOR,
-	OBJ_46,
+	OBJECTIVE_AIM_GUN_AT_PED,
 	OBJ_47,
 	OBJECTIVE_WAIT_FOR_RAIN_TO_END,
-	OBJ_49,
+	OBJECTIVE_SPRINT_TO_COORD,
 	OBJ_50,
 	OBJ_51,
 	OBJECTIVE_WAIT_FOR_BUS,
@@ -442,10 +442,10 @@ public:
 	//uint32 b155_10
 	uint32 bMiamiViceCop : 1;
 	uint32 bMoneyHasBeenGivenByScript : 1; //
-	//uint32 b155_80
+	uint32 bHasBeenPhotographed : 1;  //
 
 	uint32 bIsDrowning : 1;
-	uint32 bCanDrownInWater : 1; // Originally bDrownsInWater
+	uint32 bDrownsInWater : 1;
 	//uint32 b156_4
 	//uint32 b156_8
 	uint32 bIsPlayerFriend : 1;
@@ -453,23 +453,23 @@ public:
 	uint32 bHeadStuckInCollision : 1;
 #endif
 	uint32 bDeadPedInFrontOfCar : 1;
-	//uint32 b156_80
+	uint32 bStayInCarOnJack : 1;
 
-	//uint32 b157_1
-	//uint32 b157_2
-	//uint32 b157_4
+	uint32 bDontFight : 1;
+	uint32 bDoomAim : 1;
+	uint32 bCanBeShotInVehicle : 1;
 	//uint32 b157_8
 	//uint32 b157_10
 	//uint32 b157_20
 	//uint32 b157_40
-	//uint32 b157_80
+	uint32 bIgnoreThreatsBehindObjects : 1;
 
-	//uint32 b158_1
+	uint32 bNeverEverTargetThisPed : 1;
 	//uint32 b158_2
 	//uint32 b158_4
 	//uint32 b158_8
 	//uint32 b158_10
-	//uint32 b158_20
+	uint32 bBoughtIceCream : 1;
 	//uint32 b158_40
 	//uint32 b158_80
 
-- 
cgit v1.2.3