diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-06 00:11:18 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-06 00:11:18 +0200 |
| commit | e5da4c2b4de20397d52837ddaf6e482d88819757 (patch) | |
| tree | d76515de66ca5d119dc8c7dce7fc99746c734831 /src/control/Script.cpp | |
| parent | script colstore stuff (diff) | |
| parent | getting the vice city map to work (diff) | |
| download | re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar.gz re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar.bz2 re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar.lz re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar.xz re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar.zst re3-e5da4c2b4de20397d52837ddaf6e482d88819757.zip | |
Diffstat (limited to 'src/control/Script.cpp')
| -rw-r--r-- | src/control/Script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 8e522203..c0bc4e42 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -589,7 +589,7 @@ void CRunningScript::Init() #ifdef USE_DEBUG_SCRIPT_LOADER int open_script() { - static int scriptToLoad = 0; + static int scriptToLoad = 1; if (GetAsyncKeyState('G') & 0x8000) scriptToLoad = 0; @@ -600,7 +600,7 @@ int open_script() switch (scriptToLoad) { case 0: return CFileMgr::OpenFile("main.scm", "rb"); - case 1: return CFileMgr::OpenFile("main_freeroam.scm", "rb"); + case 1: return CFileMgr::OpenFile("freeroam_miami.scm", "rb"); case 2: return CFileMgr::OpenFile("main_d.scm", "rb"); } return CFileMgr::OpenFile("main.scm", "rb"); @@ -7252,7 +7252,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command) if (total == 0) CWorld::FindObjectsOfTypeInRangeSectorList(mi, CWorld::GetBigBuildingList(LEVEL_NONE), pos, range, true, &total, 16, apEntities); if (total == 0) - CWorld::FindObjectsOfTypeInRangeSectorList(mi, CWorld::GetBigBuildingList(CTheZones::FindZoneForPoint(pos)), pos, range, true, &total, 16, apEntities); + CWorld::FindObjectsOfTypeInRangeSectorList(mi, CWorld::GetBigBuildingList(CTheZones::GetLevelFromPosition(pos)), pos, range, true, &total, 16, apEntities); CEntity* pClosestEntity = nil; float min_dist = 2.0f * range; for (int i = 0; i < total; i++) { @@ -8006,7 +8006,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command) if (total == 0) CWorld::FindObjectsOfTypeInRangeSectorList(mi1, CWorld::GetBigBuildingList(LEVEL_NONE), pos, radius, true, &total, 16, apEntities); if (total == 0) - CWorld::FindObjectsOfTypeInRangeSectorList(mi1, CWorld::GetBigBuildingList(CTheZones::FindZoneForPoint(pos)), pos, radius, true, &total, 16, apEntities); + CWorld::FindObjectsOfTypeInRangeSectorList(mi1, CWorld::GetBigBuildingList(CTheZones::GetLevelFromPosition(pos)), pos, radius, true, &total, 16, apEntities); CEntity* pClosestEntity = nil; float min_dist = 2.0f * radius; for (int i = 0; i < total; i++) { |