summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-02-17 10:12:38 +0100
committerGitHub <noreply@github.com>2020-02-17 10:12:38 +0100
commit3fa200dc3e3b0d90787209ee83379dd04691d0e4 (patch)
treecaaf8977c7d7715f36ad9264d3680da4d4ab1d97 /src/peds
parentMerge pull request #326 from erorcun/erorcun (diff)
parentreview fixes (diff)
downloadre3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar
re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar.gz
re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar.bz2
re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar.lz
re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar.xz
re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar.zst
re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/PedRoutes.cpp25
-rw-r--r--src/peds/PedRoutes.h1
-rw-r--r--src/peds/PlayerPed.cpp2
3 files changed, 27 insertions, 1 deletions
diff --git a/src/peds/PedRoutes.cpp b/src/peds/PedRoutes.cpp
index c2ec51e2..9b7dafd4 100644
--- a/src/peds/PedRoutes.cpp
+++ b/src/peds/PedRoutes.cpp
@@ -43,3 +43,28 @@ CRouteNode::AddRoutePoint(int16 route, CVector pos)
gaRoutes[point].m_route = route;
gaRoutes[point].m_pos = pos;
}
+
+void
+CRouteNode::RemoveRoute(int16 route)
+{
+ uint16 first_point, last_point, i;
+ for (first_point = 0; first_point < NUMPEDROUTES; first_point++) {
+ if (gaRoutes[first_point].m_route == route)
+ break;
+ }
+ if (first_point == NUMPEDROUTES)
+ return;
+ for (last_point = first_point; last_point < NUMPEDROUTES; last_point++)
+ if (gaRoutes[last_point].m_route != route)
+ break;
+ uint16 diff = last_point - first_point;
+#ifdef FIX_BUGS
+ for (i = first_point; i < NUMPEDROUTES - diff; i++)
+ gaRoutes[i] = gaRoutes[i + diff];
+#else
+ for (i = 0; i < diff; i++)
+ gaRoutes[first_point + i] = gaRoutes[last_point + i];
+#endif
+ for (i = NUMPEDROUTES - diff; i < NUMPEDROUTES; i++)
+ gaRoutes[i].m_route = -1;
+}
diff --git a/src/peds/PedRoutes.h b/src/peds/PedRoutes.h
index ff4e6c89..d313938a 100644
--- a/src/peds/PedRoutes.h
+++ b/src/peds/PedRoutes.h
@@ -10,4 +10,5 @@ public:
static CVector GetPointPosition(int16);
static int16 GetRouteStart(int16);
static void AddRoutePoint(int16, CVector);
+ static void RemoveRoute(int16);
}; \ No newline at end of file
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 22ebefe0..9d4adcef 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -1285,7 +1285,7 @@ CPlayerPed::ProcessControl(void)
// fall through
case PED_SEEK_POS:
switch (m_nMoveState) {
- case PEDMOVE_STILL:
+ case PEDMOVE_WALK:
m_fMoveSpeed = 1.0f;
break;
case PEDMOVE_RUN: