ACTION_TEXT

This commit is contained in:
p.kosyh 2009-09-22 11:13:58 +00:00
parent 942d031405
commit 5bd4dcbd1e

View file

@ -1463,7 +1463,7 @@ iface = {
return nil; return nil;
end end
ACTION_TXT = r; -- here, life methods can redefine this ACTION_TEXT = r; -- here, life methods can redefine this
if st and v ~= false then if st and v ~= false then
local av, pv -- av -- active lifes, pv -- background local av, pv -- av -- active lifes, pv -- background
@ -1476,16 +1476,16 @@ iface = {
elseif game.forcedsc == true and here().forcedsc ~= false then elseif game.forcedsc == true and here().forcedsc ~= false then
l,v = me():look(); l,v = me():look();
end end
ACTION_TXT = iface:em(ACTION_TXT); ACTION_TEXT = iface:em(ACTION_TEXT);
vv = par("^^",iface:em(av), here():look(), iface:em(vv)); vv = par("^^",iface:em(av), here():look(), iface:em(vv));
else else
vv = par("^^",av, here():look(), vv); vv = par("^^",av, here():look(), vv);
end end
end end
if v == false then if v == false then
return fmt(ACTION_TXT); return fmt(ACTION_TEXT);
end end
vv = fmt(cat(par("^^",l,ACTION_TXT,vv),'^')); vv = fmt(cat(par("^^",l,ACTION_TEXT,vv),'^'));
if st then if st then
game._lastdisp = vv game._lastdisp = vv
end end
@ -1842,5 +1842,4 @@ end
function isForSave(k) function isForSave(k)
return string.find(k, '_') == 1 or string.match(k,'^%u') return string.find(k, '_') == 1 or string.match(k,'^%u')
end end
-- here the game begins -- here the game begins