zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Manually merge parts of EDuke32 SVN commit 8243.

Browse source
This commit is contained in:
Mitchell Richters 2020-03-18 10:11:50 +11:00 committed by Christoph Oelckers
parent 53c9d8425c
commit 062850c30a
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/rr/src/player.cpp
View file

@ -8163,7 +8163,6 @@ check_enemy_sprite:
pPlayer->pos.z = floorZ - (floorZOffset << 8); pPlayer->pos.z = floorZ - (floorZOffset << 8);
else else
{ {
pPlayer->on_ground = 0;
if (RRRA && (pPlayer->on_motorcycle || pPlayer->on_boat) && floorZ - (floorZOffset << 9) > pPlayer->pos.z) if (RRRA && (pPlayer->on_motorcycle || pPlayer->on_boat) && floorZ - (floorZOffset << 9) > pPlayer->pos.z)
{ {
if (pPlayer->moto_on_ground) if (pPlayer->moto_on_ground)
@ -8239,7 +8238,10 @@ check_enemy_sprite:
pPlayer->moto_turb = 12; pPlayer->moto_turb = 12;
} }
} }
pPlayer->on_ground = 1;
} }
else
pPlayer->on_ground = 0;
} }
} }
else else