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

entered vs onenter/onexit

Browse source
This commit is contained in:
p.kosyh 2010-06-06 10:58:23 +00:00
parent 4dd18bbff7
commit 361de2e712
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -9,7 +9,7 @@ instead (1.2.0) unstable; urgency=low
* init function;
* snapshots;
* hook and inherit;
* onexit/onenter human friendly actions;
* entered human friendly action;
-- Peter Kosyh <p.kosyh@gmail.com> Tue, 01 Jun 2010 17:40:00 +0300

23
stead/stead.lua
View file

@ -1088,6 +1088,11 @@ function go(self, where, back)
if not isRoom(ref(self.where)) then
error ("Trying to go from nowhere: "..self.where);
end
if stead.in_entered_call then
error ("Do not use goto from entered action! Use enter action instead:" .. self.where);
end
local v, r;
if not isVroom(ref(where)) and not stead.in_exit_call then
stead.in_exit_call = true -- to break recurse
@ -1116,10 +1121,14 @@ function go(self, where, back)
ref(where).__from__ = deref(self.where);
end
v = call(ref(was), 'onexit', deref(where));
res = par('^^',res,v);
--[[ v = call(ref(was), 'onexit', deref(where));
res = par('^^',res,v); ]]--
self.where = deref(where);
v = call(ref(where), 'onenter', deref(was));
stead.in_entered_call = true
v = call(ref(where), 'entered', deref(was));
stead.in_entered_call = false
res = par('^^',res,v);
if need_scene then -- or isForcedsc(ref(where)) then -- i'am not sure...
@ -1682,6 +1691,11 @@ iface = {
return nil;
end
if RAW_TEXT then
RAW_TEXT = nil
v = false
end
if v == false then
return cat(r, '\n'), false;
end
@ -2281,7 +2295,8 @@ function restore_snapshot(nr)
return nil, false
end
i = do_ini(game);
return i, false;
RAW_TEXT = true
return i;
end
function delete_snapshot(nr)