Skip to content

Commit

Permalink
Reverts #6040 (#6165)
Browse files Browse the repository at this point in the history
# About the pull request
Unforseen consequences
Will have to take a look at redoing it at some point though it made me
doubt it is even necessary
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
del: Reverted back to old throw logic
/:cl:
  • Loading branch information
Git-Nivrak authored Apr 21, 2024
1 parent 2d9d164 commit 96fdf71
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions code/modules/movement/launching/launching.dm
Original file line number Diff line number Diff line change
Expand Up @@ -182,17 +182,21 @@

add_temp_pass_flags(pass_flags)

var/turf/start_turf = get_step_towards(src, LM.target)
var/list/turf/path = get_line(start_turf, LM.target)
var/last_loc = loc

var/early_exit = FALSE
LM.dist = 0
while (src && throwing && loc == last_loc && isturf(src.loc)) // While looks scary at first but it's basically just a for until LM.dist reaches LM.range
for (var/turf/T in path)
if (!src || !throwing || loc != last_loc || !isturf(src.loc))
break
if (!LM || QDELETED(LM))
early_exit = TRUE
break
if (LM.dist >= LM.range)
break
if (!Move(get_step_towards(src, LM.target))) // If this returns FALSE, then a collision happened
if (!Move(T)) // If this returns FALSE, then a collision happened
break
last_loc = loc
if (++LM.dist >= LM.range)
Expand Down

0 comments on commit 96fdf71

Please sign in to comment.