summaryrefslogtreecommitdiffstats
path: root/src/core/Pools.cpp
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-04-19 15:54:05 +0200
committerGitHub <noreply@github.com>2020-04-19 15:54:05 +0200
commitf9ed50e17813d2a6708a6516e18041c7482a7462 (patch)
treee8d1312d1e2a9706793ac781271fedc73db91624 /src/core/Pools.cpp
parentFix savename buffer overflow (diff)
parentStruct cleanup, various fixes, enable PS2 rand (diff)
downloadre3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.gz
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.bz2
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.lz
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.xz
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.zst
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.zip
Diffstat (limited to 'src/core/Pools.cpp')
-rw-r--r--src/core/Pools.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index dfc6974a..fb64c551 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -251,7 +251,7 @@ INITSAVEBUF
continue;
if (pObject->ObjectCreatedBy == MISSION_OBJECT) {
bool bIsPickup = pObject->bIsPickup;
- bool bFlag2 = pObject->m_obj_flag2;
+ bool bPickupObjWithMessage = pObject->bPickupObjWithMessage;
bool bOutOfStock = pObject->bOutOfStock;
bool bGlassCracked = pObject->bGlassCracked;
bool bGlassBroken = pObject->bGlassBroken;
@@ -269,7 +269,7 @@ INITSAVEBUF
WriteSaveBuf(buf, (uint32)0); // same
WriteSaveBuf(buf, pObject->ObjectCreatedBy);
WriteSaveBuf(buf, bIsPickup);
- WriteSaveBuf(buf, bFlag2);
+ WriteSaveBuf(buf, bPickupObjWithMessage);
WriteSaveBuf(buf, bOutOfStock);
WriteSaveBuf(buf, bGlassCracked);
WriteSaveBuf(buf, bGlassBroken);
@@ -305,7 +305,7 @@ INITSAVEBUF
ReadSaveBuf<uint32>(buf);
pBufferObject->ObjectCreatedBy = ReadSaveBuf<int8>(buf);
pBufferObject->bIsPickup = ReadSaveBuf<bool>(buf);
- pBufferObject->m_flagE2 = ReadSaveBuf<bool>(buf);
+ pBufferObject->bPickupObjWithMessage = ReadSaveBuf<bool>(buf);
pBufferObject->bOutOfStock = ReadSaveBuf<bool>(buf);
pBufferObject->bGlassCracked = ReadSaveBuf<bool>(buf);
pBufferObject->bGlassBroken = ReadSaveBuf<bool>(buf);
@@ -325,7 +325,7 @@ INITSAVEBUF
pObject->m_objectMatrix = pBufferObject->m_objectMatrix;
pObject->ObjectCreatedBy = pBufferObject->ObjectCreatedBy;
pObject->bIsPickup = pBufferObject->bIsPickup;
- pObject->m_flagE2 = pBufferObject->m_flagE2;
+ pObject->bPickupObjWithMessage = pBufferObject->bPickupObjWithMessage;
pObject->bOutOfStock = pBufferObject->bOutOfStock;
pObject->bGlassCracked = pBufferObject->bGlassCracked;
pObject->bGlassBroken = pBufferObject->bGlassBroken;