shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4933 from Citadel-Station-13/upstream-merge-34573

Browse Source 
[MIRROR] Fixes the diagonal sliding
This commit is contained in:
deathride58
2018-01-19 19:34:31 +00:00
committed by GitHub
parent ee461d0558 4cee1037e4
commit 82353abaa6
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms_movable.dm
+17 -6
View File
@@ -157,36 +157,47 @@
. = ..()
else //Diagonal move, split it into cardinal moves
moving_diagonally = FIRST_DIAG_STEP
if (direct & 1)
if (direct & 4)
var/first_step_dir
if (direct & NORTH)
if (direct & EAST)
if (step(src, NORTH))
first_step_dir = NORTH
moving_diagonally = SECOND_DIAG_STEP
. = step(src, EAST)
else if (step(src, EAST))
first_step_dir = EAST
moving_diagonally = SECOND_DIAG_STEP
. = step(src, NORTH)
else if (direct & 8)
else if (direct & WEST)
if (step(src, NORTH))
first_step_dir = NORTH
moving_diagonally = SECOND_DIAG_STEP
. = step(src, WEST)
else if (step(src, WEST))
first_step_dir = WEST
moving_diagonally = SECOND_DIAG_STEP
. = step(src, NORTH)
else if (direct & 2)
if (direct & 4)
else if (direct & SOUTH)
if (direct & EAST)
if (step(src, SOUTH))
first_step_dir = SOUTH
moving_diagonally = SECOND_DIAG_STEP
. = step(src, EAST)
else if (step(src, EAST))
first_step_dir = EAST
moving_diagonally = SECOND_DIAG_STEP
. = step(src, SOUTH)
else if (direct & 8)
else if (direct & WEST)
if (step(src, SOUTH))
first_step_dir = SOUTH
moving_diagonally = SECOND_DIAG_STEP
. = step(src, WEST)
else if (step(src, WEST))
first_step_dir = WEST
moving_diagonally = SECOND_DIAG_STEP
. = step(src, SOUTH)
if(!. && moving_diagonally == SECOND_DIAG_STEP)
setDir(first_step_dir)
moving_diagonally = 0
return