summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-08-03 20:46:35 +0200
committerGitHub <noreply@github.com>2019-08-03 20:46:35 +0200
commit3b9b0646b89bed28f2962b3d164f8b54a562daf7 (patch)
treeb6316892f79731335148a06c9e50996c25ed27e7 /src
parentMerge pull request #180 from erorcun/erorcun (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-3b9b0646b89bed28f2962b3d164f8b54a562daf7.tar
re3-3b9b0646b89bed28f2962b3d164f8b54a562daf7.tar.gz
re3-3b9b0646b89bed28f2962b3d164f8b54a562daf7.tar.bz2
re3-3b9b0646b89bed28f2962b3d164f8b54a562daf7.tar.lz
re3-3b9b0646b89bed28f2962b3d164f8b54a562daf7.tar.xz
re3-3b9b0646b89bed28f2962b3d164f8b54a562daf7.tar.zst
re3-3b9b0646b89bed28f2962b3d164f8b54a562daf7.zip
Diffstat (limited to '')
-rw-r--r--src/control/Script.cpp12
-rw-r--r--src/core/Collision.cpp2
2 files changed, 5 insertions, 9 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 423f36dd..b5f2e7b4 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -3239,9 +3239,7 @@ int8 CRunningScript::ProcessCommandsFrom300To399(int32 command)
{
CollectParameters(&m_nIp, 1);
CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
- float angle = pPed->bInVehicle ?
- Atan2(-pPed->m_pMyVehicle->GetForward().x, pPed->m_pMyVehicle->GetForward().y) :
- Atan2(-pPed->GetForward().x, pPed->GetForward().y);
+ float angle = pPed->bInVehicle ? pPed->m_pMyVehicle->GetForward().Heading() : pPed->GetForward().Heading();
*(float*)&ScriptParams[0] = CGeneral::LimitAngle(RADTODEG(angle));
StoreParameters(&m_nIp, 1);
return 0;
@@ -3263,9 +3261,7 @@ int8 CRunningScript::ProcessCommandsFrom300To399(int32 command)
CollectParameters(&m_nIp, 1);
CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
assert(pPed);
- float angle = pPed->bInVehicle ?
- Atan2(-pPed->m_pMyVehicle->GetForward().x, pPed->m_pMyVehicle->GetForward().y) :
- Atan2(-pPed->GetForward().x, pPed->GetForward().y);
+ float angle = pPed->bInVehicle ? pPed->m_pMyVehicle->GetForward().Heading() : pPed->GetForward().Heading();
*(float*)&ScriptParams[0] = CGeneral::LimitAngle(RADTODEG(angle));
StoreParameters(&m_nIp, 1);
return 0;
@@ -3288,7 +3284,7 @@ int8 CRunningScript::ProcessCommandsFrom300To399(int32 command)
CollectParameters(&m_nIp, 1);
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
assert(pVehicle);
- float angle = Atan2(-pVehicle->GetForward().x, pVehicle->GetForward().y);
+ float angle = pVehicle->GetForward().Heading();
*(float*)&ScriptParams[0] = CGeneral::LimitAngle(RADTODEG(angle));
StoreParameters(&m_nIp, 1);
return 0;
@@ -3306,7 +3302,7 @@ int8 CRunningScript::ProcessCommandsFrom300To399(int32 command)
CollectParameters(&m_nIp, 1);
CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
assert(pObject);
- float angle = Atan2(-pObject->GetForward().x, pObject->GetForward().y);
+ float angle = pObject->GetForward().Heading();
*(float*)&ScriptParams[0] = CGeneral::LimitAngle(RADTODEG(angle));
StoreParameters(&m_nIp, 1);
return 0;
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index df1dcd63..66b29d9f 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -144,7 +144,7 @@ CCollision::LoadCollisionWhenINeedIt(bool forceChange)
if(veh && veh->IsTrain()){
if(((CTrain*)veh)->m_nDoorState != TRAIN_DOOR_OPEN)
return;
- }else if(playerCoors.z < 4.0f && !CCullZones::DoINeedToLoadCollision())
+ }else if(playerCoors.z < -4.0f && !CCullZones::DoINeedToLoadCollision())
return;
// Figure out whose level's collisions we're most likely to be interested in