diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-17 22:31:16 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-17 22:31:16 +0200 |
commit | 39931a5284699cf900c5556a5e5e82f3cc6ad3ac (patch) | |
tree | 840914dd6c1da43f02f52b891e13766837238213 /src | |
parent | sync with upstream (diff) | |
download | re3-39931a5284699cf900c5556a5e5e82f3cc6ad3ac.tar re3-39931a5284699cf900c5556a5e5e82f3cc6ad3ac.tar.gz re3-39931a5284699cf900c5556a5e5e82f3cc6ad3ac.tar.bz2 re3-39931a5284699cf900c5556a5e5e82f3cc6ad3ac.tar.lz re3-39931a5284699cf900c5556a5e5e82f3cc6ad3ac.tar.xz re3-39931a5284699cf900c5556a5e5e82f3cc6ad3ac.tar.zst re3-39931a5284699cf900c5556a5e5e82f3cc6ad3ac.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/control/Script.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 6a6c5160..6dbfdc43 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -8739,6 +8739,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command) #ifdef USE_DEBUG_SCRIPT_LOADER CFileMgr::ChangeDir("\\data\\"); int handle = CFileMgr::OpenFile(scriptfile, "rb"); + CFileMgr::ChangeDir("\\"); #else CFileMgr::ChangeDir("\\"); int handle = CFileMgr::OpenFile("data\\main.scm", "rb"); @@ -10422,6 +10423,11 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command) return 0; } case COMMAND_SET_TONIGHTS_EVENT: + { + CollectParameters(&m_nIp, 1); + debug("skipping SET_TONIGHTS_EVENT\n"); + return 0; + } case COMMAND_CLEAR_CHAR_LAST_DAMAGE_ENTITY: case COMMAND_CLEAR_CAR_LAST_DAMAGE_ENTITY: case COMMAND_FREEZE_OBJECT_POSITION: |