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

scene_delim everywhere

Browse source
This commit is contained in:
p.kosyh 2011-07-27 17:15:18 +00:00
parent 5eab096815
commit 87fcde6540
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
stead/goto.lua
View file

@ -53,7 +53,7 @@ go = function (self, where, back, noenter, noexit, nodsc)
v, r = stead.call(stead.ref(where), 'enter', stead.ref(was));
if r == false or (stead.api_version >= "1.3.0" and v == false and r == nil) then
self.where = was;
return par('^^', res, v), ret(r)
return par(stead.scene_delim, res, v), ret(r)
end
end
@ -62,7 +62,7 @@ go = function (self, where, back, noenter, noexit, nodsc)
need_scene = false;
end
res = par('^^',res,v);
res = par(stead.scene_delim, res, v);
if not back then
stead.ref(where).__from__ = stead.deref(was);
@ -82,7 +82,7 @@ go = function (self, where, back, noenter, noexit, nodsc)
stead.in_onexit_call = true
v = stead.call(stead.ref(was), 'left', stead.ref(to));
stead.in_onexit_call = false
res = par('^^',res,v);
res = par(stead.scene_delim, res, v);
end
self.where = stead.deref(to)
@ -91,7 +91,7 @@ go = function (self, where, back, noenter, noexit, nodsc)
stead.in_entered_call = true
v = stead.call(stead.ref(to), 'entered', stead.ref(was));
stead.in_entered_call = false
res = par('^^',res,v);
res = par(stead.scene_delim, res, v);
end
if tonumber(stead.ref(to).__visited) then

16
stead/stead.lua
View file

@ -888,7 +888,7 @@ stead.call_value = call_value
function room_scene(self)
local v;
v = iface:title(stead.call(self,'nam'));
v = stead.par('^^', v, stead.call(self,'dsc')); --obj_look(self));
v = stead.par(stead.scene_delim, v, stead.call(self,'dsc')); --obj_look(self));
return stead.cat(v,' ');
end
@ -966,7 +966,7 @@ end
function dialog_scene(self)
local v
v = iface:title(stead.call(self,'nam'));
v = stead.par('^^', v, stead.call(self, 'dsc')); --obj_look(self));
v = stead.par(stead.scene_delim, v, stead.call(self, 'dsc')); --obj_look(self));
return v;
end
@ -1145,7 +1145,7 @@ function phrase_action(self)
ret = stead.par(' ', ret, stead.back());
end
ret = stead.par("^^", last, ret);
ret = stead.par(stead.scene_delim, last, ret);
if ret == nil then
return r -- hack?
@ -1384,7 +1384,7 @@ function go(self, where, back)
need_scene = false;
end
end
res = stead.par('^^',res,v);
res = stead.par(stead.scene_delim, res, v);
if not back then
stead.ref(where).__from__ = stead.deref(self.where);
@ -1396,7 +1396,7 @@ function go(self, where, back)
PLAYER_MOVED = true
if need_scene then -- or isForcedsc(stead.ref(where)) then -- i'am not sure...
return stead.par('^^', res, stead.ref(where):scene());
return stead.par(stead.scene_delim, res, stead.ref(where):scene());
end
return res;
end
@ -1575,14 +1575,14 @@ function game_ini(self)
local v,vv
v = stead.do_ini(self);
vv = iface:title(stead.call(self,'nam'));
vv = stead.par('^^', vv, stead.call(self,'dsc'));
vv = stead.par(stead.scene_delim, vv, stead.call(self,'dsc'));
if type(init) == 'function' then
init();
end
-- if type(hooks) == 'function' then
-- hooks();
-- end
return stead.par("^^", vv, v);
return stead.par(stead.scene_delim, vv, v);
end
function game_start(s)
@ -2067,7 +2067,7 @@ iface = {
elseif cmd == 'way' then
r,v = me():ways();
elseif cmd == 'ls' then
r = stead.par('^^', me():objs(), me():inv(), me():ways());
r = stead.par(stead.scene_delim, me():objs(), me():inv(), me():ways());
v = nil;
elseif cmd == 'go' then
stead.state = true