Showing
2 changed files
with
5 additions
and
5 deletions
... | ... | @@ -1526,7 +1526,7 @@ function _M:knockback(srcx, srcy, dist, recursive, on_terrain) |
1526 | 1526 | engine.Actor.knockback(self, srcx, srcy, dist, recursive, on_terrain) |
1527 | 1527 | if config.settings.tome.smooth_move > 0 then |
1528 | 1528 | self:resetMoveAnim() |
1529 | - self:setMoveAnim(ox, oy, 9, 5) | |
1529 | + self:setMoveAnim(ox or 0, oy or 0, 9, 5) | |
1530 | 1530 | end |
1531 | 1531 | |
1532 | 1532 | self:attr("knockback_times", 1) |
... | ... | @@ -1539,7 +1539,7 @@ function _M:pull(srcx, srcy, dist, recursive) |
1539 | 1539 | engine.Actor.pull(self, srcx, srcy, dist, recursive) |
1540 | 1540 | if config.settings.tome.smooth_move > 0 then |
1541 | 1541 | self:resetMoveAnim() |
1542 | - self:setMoveAnim(ox, oy, 9, 5) | |
1542 | + self:setMoveAnim(ox or 0, oy or 0, 9, 5) | |
1543 | 1543 | end |
1544 | 1544 | end |
1545 | 1545 | |
... | ... | @@ -1549,7 +1549,7 @@ function _M:forceMoveAnim(x, y) |
1549 | 1549 | self:move(x, y, true) |
1550 | 1550 | if config.settings.tome.smooth_move > 0 then |
1551 | 1551 | self:resetMoveAnim() |
1552 | - self:setMoveAnim(ox, oy, 8, 5) | |
1552 | + self:setMoveAnim(ox or 0, oy or 0, 8, 5) | |
1553 | 1553 | end |
1554 | 1554 | end |
1555 | 1555 | ... | ... |
... | ... | @@ -3737,12 +3737,12 @@ newEffect{ |
3737 | 3737 | cancel_on_level_change = true, |
3738 | 3738 | parameters = { }, |
3739 | 3739 | activate = function(self, eff) |
3740 | - eff.leveid = game.zone.short_name.."-"..game.level.level | |
3740 | + eff.leveid = (game.zone and game.zone.short_name or "??").."-"..(game.level and game.level.level or "??") | |
3741 | 3741 | end, |
3742 | 3742 | deactivate = function(self, eff) |
3743 | 3743 | if (eff.allow_override or (self == game:getPlayer(true) and self:canBe("worldport") and not self:attr("never_move"))) and eff.dur <= 0 then |
3744 | 3744 | game:onTickEnd(function() |
3745 | - if eff.leveid == game.zone.short_name.."-"..game.level.level and game.player.can_change_zone then | |
3745 | + if eff.leveid == (game.zone and game.zone.short_name or "??").."-"..(game.level and game.level.level or "??") and game.player.can_change_zone then | |
3746 | 3746 | game.logPlayer(self, "You are yanked out of this place!") |
3747 | 3747 | game:changeLevel(1, eff.where or game.player.last_wilderness) |
3748 | 3748 | end | ... | ... |
-
Please register or login to post a comment