Merge branch 'master' of https://github.com/DrBeef/QuestZDoom

DrBeef · DrBeef · commit 4ae4d8a98e84 · 2021-07-31T19:51:15.000+01:00
diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/zscript/actors/player/player.zs b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/zscript/actors/player/player.zs
@@ -1254,7 +1254,7 @@ class PlayerPawn : Actor
 			Angle += cmd.yaw * (360./65536.);
 		}
 
-		player.onground = (pos.z <= floorz) || bOnMobj || bMBFBouncer || (player.cheats & CF_NOCLIP2);
+		player.onground = (pos.z <= floorz + 0.1) || bOnMobj || bMBFBouncer || (player.cheats & CF_NOCLIP2);
 
 		// killough 10/98:
 		//

Original file line number	Diff line number	Diff line change
`@@ -1254,7 +1254,7 @@ class PlayerPawn : Actor`
`1254`	`1254`	`Angle += cmd.yaw * (360./65536.);`
`1255`	`1255`	`}`
`1256`	`1256`
`1257`		`- player.onground = (pos.z <= floorz) \|\| bOnMobj \|\| bMBFBouncer \|\| (player.cheats & CF_NOCLIP2);`
	`1257`	`+ player.onground = (pos.z <= floorz + 0.1) \|\| bOnMobj \|\| bMBFBouncer \|\| (player.cheats & CF_NOCLIP2);`
`1258`	`1258`
`1259`	`1259`	`// killough 10/98:`
`1260`	`1260`	`//`