Skip to content

Commit

Permalink
bugfix: Multitile Objects Move Fix (#5314)
Browse files Browse the repository at this point in the history
Multitile Objects Move Fix
  • Loading branch information
Gottfrei authored Jun 30, 2024
1 parent 845b864 commit 0a0c351
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions code/game/atoms_movable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,9 @@
var/list/new_locs
if(is_multi_tile && isturf(newloc))
new_locs = block(
newloc,
newloc.x,
newloc.y,
newloc.z,
min(world.maxx, newloc.x + (CEILING(bound_width / world.icon_size, 1) - 1)),
min(world.maxy, newloc.y + (CEILING(bound_height / world.icon_size, 1) - 1)),
newloc.z
Expand Down Expand Up @@ -616,8 +618,8 @@
setDir(first_step_dir)
else if(!inertia_moving)
newtonian_move(direct)
if(client_mobs_in_contents) // We're done moving, update our parallax now
update_parallax_contents()
if(client_mobs_in_contents) // We're done moving, update our parallax now
update_parallax_contents()
moving_diagonally = NONE
return .

Expand Down Expand Up @@ -815,7 +817,9 @@
if(!same_loc)
if(is_multi_tile && isturf(destination))
var/list/new_locs = block(
destination,
destination.x,
destination.y,
destination.z,
min(world.maxx, destination.x + (CEILING(bound_width / world.icon_size, 1) - 1)),
min(world.maxy, destination.y + (CEILING(bound_height / world.icon_size, 1) - 1)),
destination.z
Expand Down

0 comments on commit 0a0c351

Please sign in to comment.