Merge remote-tracking branch 'origin/master'

This commit is contained in:
Max Cahill 2020-06-15 21:11:23 +10:00
commit b63cb34f41

View File

@ -167,7 +167,7 @@ function state_machine:as_state(enter_state)
self._as_state = { self._as_state = {
enter = function(m, s) enter = function(m, s)
self.parent = m self.parent = m
self:set_state(enter_state) self:set_state(enter_state, true)
end, end,
update = function(m, s, dt) update = function(m, s, dt)
return self:update(dt) return self:update(dt)