From f3864c60c7b25a3256ee8b6500946c9fa0060697 Mon Sep 17 00:00:00 2001 From: unknown <45179536+r3cp3ct@users.noreply.github.com> Date: Sat, 11 Jun 2022 11:34:53 +0300 Subject: [PATCH] Regular slopes have correct collision Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com> Co-authored-by: sigonasr2 --- maps/world1.map | Bin 295488 -> 295488 bytes src/sig/objects/Player.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/world1.map b/maps/world1.map index 364c535c8360d90a9277cd9ef7e2862c666d7a92..19829beffda632ab13fdcec9c0ebecd00d1173fd 100644 GIT binary patch delta 73 zcmX@mB6OfdXoIZ8MxiInllg7f7}+;-$cS@HRA8HIuOhYCUgaM9WO)OLi3(hs?R9Rj a1C?+z%bT>zn=k?~6A&|Rmp5Ti^aB7gS`=RZ delta 80 zcmX@mB6OfdXoIZ8^g|6S?>8!ZWtz-y!?T%JMu=mwyoJ-|M3p`4lVuG!CaW6=OjO|7 iY_D^JeWC)#WP1mZW@D3fV-rRoW&&d7?Zzf7ynX;>;uzfk diff --git a/src/sig/objects/Player.java b/src/sig/objects/Player.java index d9fc489..2d8c44f 100644 --- a/src/sig/objects/Player.java +++ b/src/sig/objects/Player.java @@ -467,7 +467,7 @@ public class Player extends AnimatedObject{ return -(getX()%Tile.TILE_WIDTH)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4); case SMALL_SLOPE_RIGHT: - return Tile.TILE_WIDTH-(getX()%Tile.TILE_WIDTH)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4); + return (getX()%Tile.TILE_WIDTH)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4)-Tile.TILE_WIDTH; } return 0; }