diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2020-04-18 12:08:38 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2020-04-18 12:08:38 +0200 |
| commit | 2b1570de703c32ab43c979c286413a3a1c5e3dc0 (patch) | |
| tree | ff5510329a08fd5b3dca88de1c9fc5e36abef1b9 /src/control | |
| parent | Part one (diff) | |
| parent | Zones save/load (diff) | |
| download | re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.gz re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.bz2 re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.lz re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.xz re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.zst re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 6a8028a2..f1cc8ede 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -6909,7 +6909,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command) CVector cp3 = tmp_matrix * CVector(pColModel->boundingBox.min.x, pColModel->boundingBox.max.y, pColModel->boundingBox.min.z); CVector cp4 = tmp_matrix * CVector(pColModel->boundingBox.min.x, pColModel->boundingBox.min.y, pColModel->boundingBox.max.z); int16 collisions; - CWorld::FindObjectsIntersectingAngledCollisionBox(pColModel->boundingBox, tmp_matrix, pos, + CWorld::FindObjectsIntersectingAngledCollisionBox(pColModel->boundingBox, tmp_matrix, newPosition, min(cp1.x, min(cp2.x, min(cp3.x, cp4.x))), min(cp1.y, min(cp2.y, min(cp3.y, cp4.y))), max(cp1.x, max(cp2.x, max(cp3.x, cp4.x))), |