summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-13 12:29:17 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-13 12:29:17 +0200
commit509d57edcb4e60be87548b202b33cef508f11fd1 (patch)
tree2b8586cff3c2cebcc807eaf0d4c287ef96ebfe62 /src
parentRedoing some pool reading for better alignment (diff)
downloadre3-509d57edcb4e60be87548b202b33cef508f11fd1.tar
re3-509d57edcb4e60be87548b202b33cef508f11fd1.tar.gz
re3-509d57edcb4e60be87548b202b33cef508f11fd1.tar.bz2
re3-509d57edcb4e60be87548b202b33cef508f11fd1.tar.lz
re3-509d57edcb4e60be87548b202b33cef508f11fd1.tar.xz
re3-509d57edcb4e60be87548b202b33cef508f11fd1.tar.zst
re3-509d57edcb4e60be87548b202b33cef508f11fd1.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/CarCtrl.cpp2
-rw-r--r--src/vehicles/Cranes.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index d6ccc8bb..cd86ce4c 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -461,8 +461,6 @@ CCarCtrl::GenerateOneRandomCar()
directionCurrentLinkY = pCurrentLink->GetDirY() * pVehicle->AutoPilot.m_nCurrentDirection;
directionNextLinkX = pNextLink->GetDirX() * pVehicle->AutoPilot.m_nNextDirection;
directionNextLinkY = pNextLink->GetDirY() * pVehicle->AutoPilot.m_nNextDirection;
- pCurNode = &ThePaths.m_pathNodes[pVehicle->AutoPilot.m_nCurrentRouteNode];
- pNextNode = &ThePaths.m_pathNodes[pVehicle->AutoPilot.m_nNextRouteNode];
}
#else
float currentPathLinkForwardX = pVehicle->AutoPilot.m_nCurrentDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo].GetDirX();
diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp
index 9c1442c4..9c8f9fda 100644
--- a/src/vehicles/Cranes.cpp
+++ b/src/vehicles/Cranes.cpp
@@ -180,7 +180,7 @@ bool CCranes::IsThisCarPickedUp(float X, float Y, CVehicle* pVehicle)
for (int i = 0; i < NumCranes; i++) {
float distance = (CVector2D(X, Y) - aCranes[i].m_pCraneEntity->GetPosition()).Magnitude();
if (distance < MAX_DISTANCE_TO_FIND_CRANE && aCranes[i].m_pVehiclePickedUp == pVehicle) {
- if (aCranes[i].m_nCraneStatus == CCrane::LIFTING_TARGET || aCranes[i].m_nCraneStatus == CCrane::ROTATING_TARGET)
+ if (aCranes[i].m_nCraneState == CCrane::LIFTING_TARGET || aCranes[i].m_nCraneState == CCrane::ROTATING_TARGET)
result = true;
}
}