summaryrefslogtreecommitdiffstats
path: root/src/weapons
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-13 15:24:00 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-13 15:24:00 +0200
commit3f1001b86bffe6c5de8b7c6ce047d0f2bc3472b4 (patch)
tree7751883d8ad7cdab3854af08005d2bb70b4215f3 /src/weapons
parentcar control and cranes fixes (diff)
downloadre3-3f1001b86bffe6c5de8b7c6ce047d0f2bc3472b4.tar
re3-3f1001b86bffe6c5de8b7c6ce047d0f2bc3472b4.tar.gz
re3-3f1001b86bffe6c5de8b7c6ce047d0f2bc3472b4.tar.bz2
re3-3f1001b86bffe6c5de8b7c6ce047d0f2bc3472b4.tar.lz
re3-3f1001b86bffe6c5de8b7c6ce047d0f2bc3472b4.tar.xz
re3-3f1001b86bffe6c5de8b7c6ce047d0f2bc3472b4.tar.zst
re3-3f1001b86bffe6c5de8b7c6ce047d0f2bc3472b4.zip
Diffstat (limited to '')
-rw-r--r--src/weapons/Weapon.cpp29
1 files changed, 17 insertions, 12 deletions
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp
index 67e01a2e..88c4788c 100644
--- a/src/weapons/Weapon.cpp
+++ b/src/weapons/Weapon.cpp
@@ -2284,27 +2284,32 @@ CWeapon::ProcessLineOfSight(CVector const &point1, CVector const &point2, CColPo
}
#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
CWeapon::Save(uint8*& buf)
{
- WriteSaveBuf<uint32>(buf, m_eWeaponType);
- WriteSaveBuf<uint32>(buf, m_eWeaponState);
- WriteSaveBuf<uint32>(buf, m_nAmmoInClip);
- WriteSaveBuf<uint32>(buf, m_nAmmoTotal);
- WriteSaveBuf<uint32>(buf, m_nTimer);
- WriteSaveBuf<bool>(buf, m_bAddRotOffset);
+ CopyToBuf(buf, m_eWeaponType);
+ CopyToBuf(buf, m_eWeaponState);
+ CopyToBuf(buf, m_nAmmoInClip);
+ CopyToBuf(buf, m_nAmmoTotal);
+ CopyToBuf(buf, m_nTimer);
+ CopyToBuf(buf, m_bAddRotOffset);
SkipSaveBuf(buf, 3);
}
void
CWeapon::Load(uint8*& buf)
{
- m_eWeaponType = (eWeaponType)ReadSaveBuf<uint32>(buf);
- m_eWeaponState = (eWeaponState)ReadSaveBuf<uint32>(buf);
- m_nAmmoInClip = ReadSaveBuf<uint32>(buf);
- m_nAmmoTotal = ReadSaveBuf<uint32>(buf);
- m_nTimer = ReadSaveBuf<uint32>(buf);
- m_bAddRotOffset = ReadSaveBuf<bool>(buf);
+ CopyFromBuf(buf, m_eWeaponType);
+ CopyFromBuf(buf, m_eWeaponState);
+ CopyFromBuf(buf, m_nAmmoInClip);
+ CopyFromBuf(buf, m_nAmmoTotal);
+ CopyFromBuf(buf, m_nTimer);
+ CopyFromBuf(buf, m_bAddRotOffset);
SkipSaveBuf(buf, 3);
}
+
+#undef CopyFromBuf
+#undef CopyToBuf
#endif