From 062850c30a3d13c24bf33fa04a75eb027ad225a2 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Wed, 18 Mar 2020 10:11:50 +1100
Subject: [PATCH] Manually merge parts of EDuke32 SVN commit 8243.

---
 source/rr/src/player.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/rr/src/player.cpp b/source/rr/src/player.cpp
index 403a5c05a..ff3ce7ac7 100644
--- a/source/rr/src/player.cpp
+++ b/source/rr/src/player.cpp
@@ -8163,7 +8163,6 @@ check_enemy_sprite:
                 pPlayer->pos.z = floorZ - (floorZOffset << 8);
             else
             {
-                pPlayer->on_ground = 0;
                 if (RRRA && (pPlayer->on_motorcycle || pPlayer->on_boat) && floorZ - (floorZOffset << 9) > pPlayer->pos.z)
                 {
                     if (pPlayer->moto_on_ground)
@@ -8239,7 +8238,10 @@ check_enemy_sprite:
                             pPlayer->moto_turb = 12;
                         }
                     }
+                    pPlayer->on_ground = 1;
                 }
+                else
+                    pPlayer->on_ground = 0;
             }
         }
         else