Permalink
Browse files

Merge pull request #1453 from mugmuggy/walkdrinksinterrupted

[RDY] Interrupted walk should refer to original must_happen
  • Loading branch information...
TheCycoONE committed Sep 14, 2018
2 parents bf296b4 + 92d58c5 commit 8f31878e4fbd4805a5cc8bc4702d87991735722a
Showing with 4 additions and 4 deletions.
  1. +4 −4 CorsixTH/Lua/entities/patient.lua
@@ -372,7 +372,7 @@ function Patient:falling()
name = current.name,
x = current.x,
y = current.y,
must_happen = current.must_happen,
must_happen = (current.name == "walk" and current.saved_must_happen) or (current.name == "idle" and current.must_happen),
is_entering = current.is_entering,
}, 2)
else
@@ -431,7 +431,7 @@ function Patient:vomit()
name = current.name,
x = current.x,
y = current.y,
must_happen = current.must_happen,
must_happen = (current.name == "walk" and current.saved_must_happen) or (current.name == "idle" and current.must_happen),
is_entering = current.is_entering,
}, 2)
else
@@ -465,7 +465,7 @@ function Patient:pee()
name = current.name,
x = current.x,
y = current.y,
must_happen = current.must_happen,
must_happen = (current.name == "walk" and current.saved_must_happen) or (current.name == "idle" and current.must_happen),
is_entering = current.is_entering,
}, 2)
else
@@ -879,7 +879,7 @@ function Patient:tickDay()
name = current.name,
x = current.x,
y = current.y,
must_happen = current.must_happen,
must_happen = (current.name == "walk" and current.saved_must_happen) or (current.name == "idle" and current.must_happen),
is_entering = current.is_entering,
}, 3)
-- If we were idling, also go away a little before continuing with

0 comments on commit 8f31878

Please sign in to comment.