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

dlg fixes, fading fixes

Browse source
This commit is contained in:
p.kosyh 2010-07-11 10:20:04 +00:00
parent 1a1bc8ba70
commit f6708f5d93
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
stead/gui.lua
View file

@ -187,7 +187,9 @@ stead.fmt = fmt
game.fading = function(s)
local rc = false
local p = call(here(), 'pic');
if stead.cmd == 'load' then
game.lastpic = p;
return true
end
if not stead.state then --only for states!!!
@ -196,7 +198,6 @@ game.fading = function(s)
if game._time == 1 then -- first cmd
return true
end
local p = call(here(), 'pic');
if PLAYER_MOVED or game.lastpic ~= p then
rc = true
end

6
stead/stead.lua
View file

@ -973,6 +973,8 @@ function phrase_action(self)
-- here it is
ph:disable(); -- /* disable it!!! */
local last = call(ph, 'ans');
if type(ph.do_act) == 'string' then
local f = loadstring(ph.do_act);
if f ~= nil then
@ -983,7 +985,9 @@ function phrase_action(self)
elseif type(ph.do_act) == 'function' then
ret = ph.do_act(self);
end
local last = call(ph, 'ans');
if ret == nil then ret = stead.pget(); end
if last == true or ret == true then
r = true;
end