oreolek/steed
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

player_moved added

Browse source
This commit is contained in:
p.kosyh 2010-07-15 13:42:26 +00:00
parent 739fb7cc65
commit e11403b114
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
stead/goto.lua
View file

@ -164,9 +164,9 @@ iface.fmt = function(self, cmd, st, moved, r, av, objs, pv) -- st -- changed sta
if st then
av = txtem(av);
pv = txtem(pv);
if not PLAYER_MOVED then
-- if not PLAYER_MOVED then
r = txtem(r)
end
-- end
if isForcedsc(here()) or NEED_SCENE then
l = here():scene();
end

9
stead/stead.lua
View file

@ -1341,7 +1341,7 @@ function game_life(self)
local av,v
stead.in_life_call = true;
stead.lifes_off = list {}; -- lifes to off
local m = PLAYER_MOVED
stead.PLAYER_MOVED = PLAYER_MOVED
for i,o in opairs(self.lifes) do
local vv
local pre
@ -1356,7 +1356,8 @@ function game_life(self)
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;
for i,o in ipairs(stead.lifes_off) do
lifeoff(o);
@ -1365,6 +1366,10 @@ function game_life(self)
return v, av;
end
function player_moved()
return PLAYER_MOVED or stead.PLAYER_MOVED
end
function check_list(k, v, p)
if v.check == nil or not v:check(stead.string.format("%s[%q]", p, k)) then
error ("error in list: "..stead.object..'.'..k);