Permalink
Browse files

Merge pull request #1477 from mugmuggy/minorfixes

[RDY] Three one liner fixes
  • Loading branch information...
TheCycoONE committed Oct 8, 2018
2 parents c876536 + eb9662e commit 23dd52e177763b7a00b0aa578d4962c07bd70d60
Showing with 3 additions and 3 deletions.
  1. +1 −1 CorsixTH/Lua/dialogs/edit_room.lua
  2. +1 −1 CorsixTH/Lua/hospital.lua
  3. +1 −1 CorsixTH/Lua/humanoid_actions/queue.lua
@@ -611,7 +611,7 @@ function UIEditRoom:returnToDoorPhase()
break
end
if obj.object_type.id == "litter" then -- Silently remove litter from the world.
obj.remove()
obj:remove()
break
end
local obj_state = obj:getState()
@@ -692,7 +692,7 @@ function Hospital:countSittingStanding()
local numberStanding = 0
for _, patient in ipairs(self.patients) do
local pat_action = patient:getCurrentAction()
if pat_action.name == "idle" then
if pat_action.name == "idle" and not patient:getRoom() then
numberStanding = numberStanding + 1
elseif pat_action.name == "use_object" and pat_action.object.object_type.id == "bench" then
numberSitting = numberSitting + 1
@@ -275,7 +275,7 @@ local action_queue_on_change_position = permanent"action_queue_on_change_positio
end
end
humanoid.action_queue[idle_index].direction = idle_direction
humanoid:queueAction(WalkAction(ix, iy):setMustHappen(true), idle_index - 1)
humanoid:queueAction(WalkAction(ix, iy):setMustHappen(true):setIsLeaving(humanoid:isLeaving()), idle_index - 1)
else
action.current_bench_distance = nil
local num_actions_prior = action_queue_leave_bench(action, humanoid)

0 comments on commit 23dd52e

Please sign in to comment.