From 3f1001b86bffe6c5de8b7c6ce047d0f2bc3472b4 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Wed, 13 May 2020 16:24:00 +0300
Subject: More save/load alignment fixes

---
 src/peds/Ped.cpp | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'src/peds/Ped.cpp')

diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index f4e99d4d..d261385a 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -17738,23 +17738,25 @@ CPed::SetExitBoat(CVehicle *boat)
 }
 
 #ifdef COMPATIBLE_SAVES
+#define CopyFromBuf(buf, data) memcpy(&data, buf, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
+#define CopyToBuf(buf, data) memcpy(buf, &data, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
 void
 CPed::Save(uint8*& buf)
 {
 	SkipSaveBuf(buf, 52);
-	WriteSaveBuf<float>(buf, GetPosition().x);
-	WriteSaveBuf<float>(buf, GetPosition().y);
-	WriteSaveBuf<float>(buf, GetPosition().z);
+	CopyToBuf(buf, GetPosition().x);
+	CopyToBuf(buf, GetPosition().y);
+	CopyToBuf(buf, GetPosition().z);
 	SkipSaveBuf(buf, 288);
-	WriteSaveBuf<uint8>(buf, CharCreatedBy);
+	CopyToBuf(buf, CharCreatedBy);
 	SkipSaveBuf(buf, 351);
-	WriteSaveBuf<float>(buf, m_fHealth);
-	WriteSaveBuf<float>(buf, m_fArmour);
+	CopyToBuf(buf, m_fHealth);
+	CopyToBuf(buf, m_fArmour);
 	SkipSaveBuf(buf, 148);
 	for (int i = 0; i < 13; i++) // has to be hardcoded
 		m_weapons[i].Save(buf);
 	SkipSaveBuf(buf, 5);
-	WriteSaveBuf<uint8>(buf, m_maxWeaponTypeAllowed);
+	CopyToBuf(buf, m_maxWeaponTypeAllowed);
 	SkipSaveBuf(buf, 162);
 }
 
@@ -17762,19 +17764,21 @@ void
 CPed::Load(uint8*& buf)
 {
 	SkipSaveBuf(buf, 52);
-	GetMatrix().GetPosition().x = ReadSaveBuf<float>(buf);
-	GetMatrix().GetPosition().y = ReadSaveBuf<float>(buf);
-	GetMatrix().GetPosition().z = ReadSaveBuf<float>(buf);
+	CopyFromBuf(buf, GetMatrix().GetPosition().x);
+	CopyFromBuf(buf, GetMatrix().GetPosition().y);
+	CopyFromBuf(buf, GetMatrix().GetPosition().z);
 	SkipSaveBuf(buf, 288);
-	CharCreatedBy = ReadSaveBuf<uint8>(buf);
+	CopyFromBuf(buf, CharCreatedBy);
 	SkipSaveBuf(buf, 351);
-	m_fHealth = ReadSaveBuf<float>(buf);
-	m_fArmour = ReadSaveBuf<float>(buf);
+	CopyFromBuf(buf, m_fHealth);
+	CopyFromBuf(buf, m_fArmour);
 	SkipSaveBuf(buf, 148);
 	for (int i = 0; i < 13; i++) // has to be hardcoded
 		m_weapons[i].Load(buf);
 	SkipSaveBuf(buf, 5);
-	m_maxWeaponTypeAllowed = ReadSaveBuf<uint8>(buf);
+	CopyFromBuf(buf, m_maxWeaponTypeAllowed);
 	SkipSaveBuf(buf, 162);
 }
+#undef CopyFromBuf
+#undef CopyToBuf
 #endif
-- 
cgit v1.2.3


From 9d4d83db0d9b9bd2921972a030a0c53566688fbb Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Thu, 14 May 2020 14:01:24 +0300
Subject: some fixes

---
 src/peds/Ped.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/peds/Ped.cpp')

diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index d261385a..fd8fd540 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -16166,7 +16166,11 @@ CPed::SeekCar(void)
 	}
 
 	if (dest.x == 0.0f && dest.y == 0.0f) {
+#ifdef FIX_BUGS
+		if ((!IsPlayer() && CharCreatedBy != MISSION_CHAR) || vehToSeek->VehicleCreatedBy != MISSION_VEHICLE || vehToSeek->pDriver || !vehToSeek->CanPedOpenLocks(this)) {
+#else
 		if ((!IsPlayer() && CharCreatedBy != MISSION_CHAR) || vehToSeek->VehicleCreatedBy != MISSION_VEHICLE || vehToSeek->pDriver) {
+#endif
 			RestorePreviousState();
 			if (IsPlayer()) {
 				ClearObjective();
-- 
cgit v1.2.3