summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-07-28 14:53:26 +0200
committerGitHub <noreply@github.com>2019-07-28 14:53:26 +0200
commit179a34177f2de80e6d7d362dfba27b9c69241dd3 (patch)
tree9db8a9057d0b96fac16bdb9f76796c87e5283706
parentMerge branch 'master' of github.com:GTAmodding/re3 (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-179a34177f2de80e6d7d362dfba27b9c69241dd3.tar
re3-179a34177f2de80e6d7d362dfba27b9c69241dd3.tar.gz
re3-179a34177f2de80e6d7d362dfba27b9c69241dd3.tar.bz2
re3-179a34177f2de80e6d7d362dfba27b9c69241dd3.tar.lz
re3-179a34177f2de80e6d7d362dfba27b9c69241dd3.tar.xz
re3-179a34177f2de80e6d7d362dfba27b9c69241dd3.tar.zst
re3-179a34177f2de80e6d7d362dfba27b9c69241dd3.zip
-rw-r--r--src/control/CarGen.cpp2
-rw-r--r--src/control/Phones.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/control/CarGen.cpp b/src/control/CarGen.cpp
index f9e9638b..65a23c8c 100644
--- a/src/control/CarGen.cpp
+++ b/src/control/CarGen.cpp
@@ -305,4 +305,4 @@ InjectHook(0x543020, CTheCarGenerators::Init, PATCH_JUMP);
InjectHook(0x542F40, CTheCarGenerators::Process, PATCH_JUMP);
InjectHook(0x543050, CTheCarGenerators::SaveAllCarGenerators, PATCH_JUMP);
InjectHook(0x5431E0, CTheCarGenerators::LoadAllCarGenerators, PATCH_JUMP);
-ENDPATCHES \ No newline at end of file
+ENDPATCHES
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp
index 499fa253..e2a9ee13 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -76,6 +76,7 @@ CPhoneInfo::Load(CPhoneInfo *source, uint8 buffer)
m_aPhones[phoneId].m_vecPos = phone->m_vecPos;
memcpy(m_aPhones[phoneId].m_apMessages, phone->m_apMessages, sizeof(wchar*) * 6);
+ m_aPhones[phoneId].m_lastTimeRepeatedMsgShown = phone->m_lastTimeRepeatedMsgShown;
m_aPhones[phoneId].m_pEntity = phone->m_pEntity;
m_aPhones[phoneId].m_nState = phone->m_nState;
m_aPhones[phoneId].field_30 = phone->field_30;
@@ -183,13 +184,14 @@ CPhoneInfo::Save(CPhoneInfo *destination, uint32 *size)
phone->m_vecPos = m_aPhones[phoneId].m_vecPos;
memcpy(phone->m_apMessages, m_aPhones[phoneId].m_apMessages, sizeof(wchar*) * 6);
+ phone->m_lastTimeRepeatedMsgShown = m_aPhones[phoneId].m_lastTimeRepeatedMsgShown;
phone->m_pEntity = m_aPhones[phoneId].m_pEntity;
phone->m_nState = m_aPhones[phoneId].m_nState;
phone->field_30 = m_aPhones[phoneId].field_30;
// Convert entity pointer to building pool index while saving
if (phone->m_pEntity) {
- phone->m_pEntity = (CEntity*) CPools::GetBuildingPool()->GetJustIndex((CBuilding*)phone->m_pEntity) + 1;
+ phone->m_pEntity = (CEntity*) (CPools::GetBuildingPool()->GetJustIndex((CBuilding*)phone->m_pEntity) + 1);
}
}
}