player_moved added
This commit is contained in:
parent
739fb7cc65
commit
e11403b114
|
@ -164,9 +164,9 @@ iface.fmt = function(self, cmd, st, moved, r, av, objs, pv) -- st -- changed sta
|
||||||
if st then
|
if st then
|
||||||
av = txtem(av);
|
av = txtem(av);
|
||||||
pv = txtem(pv);
|
pv = txtem(pv);
|
||||||
if not PLAYER_MOVED then
|
-- if not PLAYER_MOVED then
|
||||||
r = txtem(r)
|
r = txtem(r)
|
||||||
end
|
-- end
|
||||||
if isForcedsc(here()) or NEED_SCENE then
|
if isForcedsc(here()) or NEED_SCENE then
|
||||||
l = here():scene();
|
l = here():scene();
|
||||||
end
|
end
|
||||||
|
|
|
@ -1341,7 +1341,7 @@ function game_life(self)
|
||||||
local av,v
|
local av,v
|
||||||
stead.in_life_call = true;
|
stead.in_life_call = true;
|
||||||
stead.lifes_off = list {}; -- lifes to off
|
stead.lifes_off = list {}; -- lifes to off
|
||||||
local m = PLAYER_MOVED
|
stead.PLAYER_MOVED = PLAYER_MOVED
|
||||||
for i,o in opairs(self.lifes) do
|
for i,o in opairs(self.lifes) do
|
||||||
local vv
|
local vv
|
||||||
local pre
|
local pre
|
||||||
|
@ -1356,7 +1356,8 @@ function game_life(self)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if not PLAYER_MOVED then PLAYER_MOVED = m end
|
if not PLAYER_MOVED then PLAYER_MOVED = stead.PLAYER_MOVED end
|
||||||
|
stead.PLAYER_MOVED = nil
|
||||||
stead.in_life_call = false;
|
stead.in_life_call = false;
|
||||||
for i,o in ipairs(stead.lifes_off) do
|
for i,o in ipairs(stead.lifes_off) do
|
||||||
lifeoff(o);
|
lifeoff(o);
|
||||||
|
@ -1365,6 +1366,10 @@ function game_life(self)
|
||||||
return v, av;
|
return v, av;
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function player_moved()
|
||||||
|
return PLAYER_MOVED or stead.PLAYER_MOVED
|
||||||
|
end
|
||||||
|
|
||||||
function check_list(k, v, p)
|
function check_list(k, v, p)
|
||||||
if v.check == nil or not v:check(stead.string.format("%s[%q]", p, k)) then
|
if v.check == nil or not v:check(stead.string.format("%s[%q]", p, k)) then
|
||||||
error ("error in list: "..stead.object..'.'..k);
|
error ("error in list: "..stead.object..'.'..k);
|
||||||
|
|
Loading…
Reference in a new issue