summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2021-01-08 23:02:17 +0100
committerFire-Head <Fire-Head@users.noreply.github.com>2021-01-08 23:02:17 +0100
commit91c6389754204c7cc419cecb4b73d576106890c3 (patch)
tree99ee9b860a2739d0ffee7b5d88d8d50c0de4283d /src/control
parentsync with re3 (diff)
parentUse original names (diff)
downloadre3-91c6389754204c7cc419cecb4b73d576106890c3.tar
re3-91c6389754204c7cc419cecb4b73d576106890c3.tar.gz
re3-91c6389754204c7cc419cecb4b73d576106890c3.tar.bz2
re3-91c6389754204c7cc419cecb4b73d576106890c3.tar.lz
re3-91c6389754204c7cc419cecb4b73d576106890c3.tar.xz
re3-91c6389754204c7cc419cecb4b73d576106890c3.tar.zst
re3-91c6389754204c7cc419cecb4b73d576106890c3.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script5.cpp2
-rw-r--r--src/control/Script7.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp
index 822a70a8..f970cf89 100644
--- a/src/control/Script5.cpp
+++ b/src/control/Script5.cpp
@@ -2759,7 +2759,7 @@ void CTheScripts::UpdateObjectIndices()
CBaseModelInfo* pModel = CModelInfo::GetModelInfo(j);
if (!pModel)
continue;
- strcpy(name, pModel->GetName());
+ strcpy(name, pModel->GetModelName());
#ifdef FIX_BUGS
for (int k = 0; k < USED_OBJECT_NAME_LENGTH && name[k]; k++)
#else
diff --git a/src/control/Script7.cpp b/src/control/Script7.cpp
index 1eaa6cd0..5a70fd28 100644
--- a/src/control/Script7.cpp
+++ b/src/control/Script7.cpp
@@ -625,7 +625,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
key[i] = tolower(key[i]);
CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
script_assert(pPed);
- UpdateCompareFlag(strcmp(key, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetName()) == 0);
+ UpdateCompareFlag(strcmp(key, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetModelName()) == 0);
return 0;
}
case COMMAND_SET_PLAYER_CAN_DO_DRIVE_BY: