diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-12 12:22:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 12:22:44 +0100 |
| commit | 8888ee3974587cfb6172e420210df75e5c5de3f7 (patch) | |
| tree | 10294da8d82bcdedaaf64cee35897a7fe08b64ea /src/control/Script5.cpp | |
| parent | Merge branch 'miami' into lcs (diff) | |
| parent | More fix (diff) | |
| download | re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar.gz re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar.bz2 re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar.lz re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar.xz re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar.zst re3-8888ee3974587cfb6172e420210df75e5c5de3f7.zip | |
Diffstat (limited to 'src/control/Script5.cpp')
| -rw-r--r-- | src/control/Script5.cpp | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp index c0909356..c0e3ecad 100644 --- a/src/control/Script5.cpp +++ b/src/control/Script5.cpp @@ -2754,30 +2754,16 @@ void CTheScripts::ReadObjectNamesFromScript() void CTheScripts::UpdateObjectIndices() { - char name[USED_OBJECT_NAME_LENGTH]; char error[112]; for (int i = 1; i < NumberOfUsedObjects; i++) { - bool found = false; - for (int j = 0; j < MODELINFOSIZE && !found; j++) { - CBaseModelInfo* pModel = CModelInfo::GetModelInfo(j); - if (!pModel) - continue; - strcpy(name, pModel->GetModelName()); -#ifdef FIX_BUGS - for (int k = 0; k < USED_OBJECT_NAME_LENGTH && name[k]; k++) -#else - for (int k = 0; k < USED_OBJECT_NAME_LENGTH; k++) -#endif - name[k] = toupper(name[k]); - if (strcmp(name, UsedObjectArray[i].name) == 0) { - found = true; - UsedObjectArray[i].index = j; - } - } - if (!found) { + UsedObjectArray[i].index = -1; + CModelInfo::GetModelInfo(UsedObjectArray[i].name, &UsedObjectArray[i].index); +#ifndef FINAL + if (UsedObjectArray[i].index == -1) { sprintf(error, "CTheScripts::UpdateObjectIndices - Couldn't find %s", UsedObjectArray[i].name); debug("%s\n", error); } +#endif } } |