changed saving compatibility

2 files changed, 85 insertions, 1 deletions

diff --git a/src/control/AutoPilot.cpp b/src/control/AutoPilot.cpp
index 69511bc8..96a1fedf 100644
--- a/src/control/AutoPilot.cpp
+++ b/src/control/AutoPilot.cpp
@@ -44,4 +44,83 @@ void CAutoPilot::RemoveOnePathNode()
 	--m_nPathFindNodesCount;
 	for (int i = 0; i < m_nPathFindNodesCount; i++)
 		m_aPathFindNodesInfo[i] = m_aPathFindNodesInfo[i + 1];
-}
\ No newline at end of file
+}
+
+#ifdef COMPATIBLE_SAVES
+void CAutoPilot::Save(uint8*& buf)
+{
+	WriteSaveBuf<int32>(buf, m_nCurrentRouteNode);
+	WriteSaveBuf<int32>(buf, m_nNextRouteNode);
+	WriteSaveBuf<int32>(buf, m_nPrevRouteNode);
+	WriteSaveBuf<uint32>(buf, m_nTimeEnteredCurve);
+	WriteSaveBuf<uint32>(buf, m_nTimeToSpendOnCurrentCurve);
+	WriteSaveBuf<uint32>(buf, m_nCurrentPathNodeInfo);
+	WriteSaveBuf<uint32>(buf, m_nNextPathNodeInfo);
+	WriteSaveBuf<uint32>(buf, m_nPreviousPathNodeInfo);
+	WriteSaveBuf<uint32>(buf, m_nAntiReverseTimer);
+	WriteSaveBuf<uint32>(buf, m_nTimeToStartMission);
+	WriteSaveBuf<int8>(buf, m_nPreviousDirection);
+	WriteSaveBuf<int8>(buf, m_nCurrentDirection);
+	WriteSaveBuf<int8>(buf, m_nNextDirection);
+	WriteSaveBuf<int8>(buf, m_nCurrentLane);
+	WriteSaveBuf<int8>(buf, m_nNextLane);
+	WriteSaveBuf<uint8>(buf, m_nDrivingStyle);
+	WriteSaveBuf<uint8>(buf, m_nCarMission);
+	WriteSaveBuf<uint8>(buf, m_nTempAction);
+	WriteSaveBuf<uint32>(buf, m_nTimeTempAction);
+	WriteSaveBuf<float>(buf, m_fMaxTrafficSpeed);
+	WriteSaveBuf<uint8>(buf, m_nCruiseSpeed);
+	uint8 flags = 0;
+	if (m_bSlowedDownBecauseOfCars) flags |= BIT(0);
+	if (m_bSlowedDownBecauseOfPeds) flags |= BIT(1);
+	if (m_bStayInCurrentLevel) flags |= BIT(2);
+	if (m_bStayInFastLane) flags |= BIT(3);
+	if (m_bIgnorePathfinding) flags |= BIT(4);
+	WriteSaveBuf<uint8>(buf, flags);
+	SkipSaveBuf(buf, 2);
+	WriteSaveBuf<float>(buf, m_vecDestinationCoors.x);
+	WriteSaveBuf<float>(buf, m_vecDestinationCoors.y);
+	WriteSaveBuf<float>(buf, m_vecDestinationCoors.z);
+	SkipSaveBuf(buf, 32);
+	WriteSaveBuf<int16>(buf, m_nPathFindNodesCount);
+	SkipSaveBuf(buf, 6);
+}
+
+void CAutoPilot::Load(uint8*& buf)
+{
+	m_nCurrentRouteNode = ReadSaveBuf<int32>(buf);
+	m_nNextRouteNode = ReadSaveBuf<int32>(buf);
+	m_nPrevRouteNode = ReadSaveBuf<int32>(buf);
+	m_nTimeEnteredCurve = ReadSaveBuf<uint32>(buf);
+	m_nTimeToSpendOnCurrentCurve = ReadSaveBuf<uint32>(buf);
+	m_nCurrentPathNodeInfo = ReadSaveBuf<uint32>(buf);
+	m_nNextPathNodeInfo = ReadSaveBuf<uint32>(buf);
+	m_nPreviousPathNodeInfo = ReadSaveBuf<uint32>(buf);
+	m_nAntiReverseTimer = ReadSaveBuf<uint32>(buf);
+	m_nTimeToStartMission = ReadSaveBuf<uint32>(buf);
+	m_nPreviousDirection = ReadSaveBuf<int8>(buf);
+	m_nCurrentDirection = ReadSaveBuf<int8>(buf);
+	m_nNextDirection = ReadSaveBuf<int8>(buf);
+	m_nCurrentLane = ReadSaveBuf<int8>(buf);
+	m_nNextLane = ReadSaveBuf<int8>(buf);
+	m_nDrivingStyle = (eCarDrivingStyle)ReadSaveBuf<uint8>(buf);
+	m_nCarMission = (eCarMission)ReadSaveBuf<uint8>(buf);
+	m_nTempAction = (eCarTempAction)ReadSaveBuf<uint8>(buf);
+	m_nTimeTempAction = ReadSaveBuf<uint32>(buf);
+	m_fMaxTrafficSpeed = ReadSaveBuf<float>(buf);
+	m_nCruiseSpeed = ReadSaveBuf<uint8>(buf);
+	uint8 flags = ReadSaveBuf<uint8>(buf);
+	m_bSlowedDownBecauseOfCars = !!(flags & BIT(0));
+	m_bSlowedDownBecauseOfPeds = !!(flags & BIT(1));
+	m_bStayInCurrentLevel = !!(flags & BIT(2));
+	m_bStayInFastLane = !!(flags & BIT(3));
+	m_bIgnorePathfinding = !!(flags & BIT(4));
+	SkipSaveBuf(buf, 2);
+	m_vecDestinationCoors.x = ReadSaveBuf<float>(buf);
+	m_vecDestinationCoors.y = ReadSaveBuf<float>(buf);
+	m_vecDestinationCoors.z = ReadSaveBuf<float>(buf);
+	SkipSaveBuf(buf, 32);
+	m_nPathFindNodesCount = ReadSaveBuf<int16>(buf);
+	SkipSaveBuf(buf, 6);
+}
+#endif
\ No newline at end of file
diff --git a/src/control/AutoPilot.h b/src/control/AutoPilot.h
index e1066071..4c356f96 100644
--- a/src/control/AutoPilot.h
+++ b/src/control/AutoPilot.h
@@ -120,5 +120,10 @@ public:
 
 	void ModifySpeed(float);
 	void RemoveOnePathNode();
+#ifdef COMPATIBLE_SAVES
+	void Save(uint8*& buf);
+	void Load(uint8*& buf);
+#endif
+
 };
 static_assert(sizeof(CAutoPilot) == 0x70, "CAutoPilot: error");