diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-01-01 21:55:01 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-01-01 21:55:01 +0100 |
| commit | 42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96 (patch) | |
| tree | 3a9d0420a04b640e4fa4083302cc56fc09d69011 /src/control | |
| parent | Merge remote-tracking branch 'upstream/master' into script_dev (diff) | |
| download | re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar.gz re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar.bz2 re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar.lz re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar.xz re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar.zst re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.zip | |
Diffstat (limited to 'src/control')
| -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 b3021094..d1e0f048 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -2544,7 +2544,7 @@ int8 CRunningScript::ProcessCommandsFrom200To299(int32 command) { CollectParameters(&m_nIp, 4); int mi = ScriptParams[0] >= 0 ? ScriptParams[0] : CTheScripts::UsedObjectArray[-ScriptParams[0]].index; - CObject* pObj = new CObject(mi, 0); + CObject* pObj = new CObject(mi, false); pObj->ObjectCreatedBy = MISSION_OBJECT; CVector pos = *(CVector*)&ScriptParams[1]; if (pos.z <= -100.0f) @@ -5305,8 +5305,8 @@ int8 CRunningScript::ProcessCommandsFrom600To699(int32 command) { CollectParameters(&m_nIp, 4); int mi = ScriptParams[0] >= 0 ? ScriptParams[0] : CTheScripts::UsedObjectArray[-ScriptParams[0]].index; - CObject* pObj = new CObject(mi, 0); - pObj->ObjectCreatedBy = MISSION_OBJECT; + CObject* pObj = new CObject(mi, false); +; pObj->ObjectCreatedBy = MISSION_OBJECT; CVector pos = *(CVector*)&ScriptParams[1]; if (pos.z <= -100.0f) pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y); @@ -5380,7 +5380,7 @@ int8 CRunningScript::ProcessCommandsFrom600To699(int32 command) case COMMAND_ADD_PARTICLE_EFFECT: { CollectParameters(&m_nIp, 5); - CVector pos = *(CVector*)&ScriptParams[0]; + CVector pos = *(CVector*)&ScriptParams[1]; if (pos.z <= 100.0f) pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y); CParticleObject::AddObject(ScriptParams[0], pos, ScriptParams[4] != 0); |