summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-04-18 04:58:43 +0200
committereray orçunus <erayorcunus@gmail.com>2020-04-18 04:58:43 +0200
commit812b9e7edab26cc04d28931b0e89ed9317b818c9 (patch)
tree80abd8e23bf4aad86e34a942c9cde8a69069653b /src/control/Script.cpp
parentMerge branch 'master' of github.com:gtamodding/re3 (diff)
downloadre3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar.gz
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar.bz2
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar.lz
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar.xz
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar.zst
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.zip
Diffstat (limited to '')
-rw-r--r--src/control/Script.cpp2
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))),