diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-04-18 05:03:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-18 05:03:15 +0200 |
| commit | 8633556579a5f11f360c3f62b1f50ddd89d7a7fb (patch) | |
| tree | 80abd8e23bf4aad86e34a942c9cde8a69069653b /src/control/Script.cpp | |
| parent | Merge branch 'master' of github.com:gtamodding/re3 (diff) | |
| parent | Various fixes (diff) | |
| download | re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar.gz re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar.bz2 re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar.lz re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar.xz re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar.zst re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.zip | |
Diffstat (limited to '')
| -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))), |