roll back new goto

This commit is contained in:
p.kosyh 2010-06-16 10:25:29 +00:00
parent 40aed624e5
commit a4dedb53dc

View file

@ -45,15 +45,17 @@ go = function (self, where, back)
self.where = deref(where); self.where = deref(where);
end end
v, r = call(ref(where), 'enter', deref(was)); if not back or not isDialog(ref(self.where)) or isDialog(ref(where)) then
if r == false then v, r = call(ref(where), 'enter', deref(was));
self.where = was; if r == false then
return par('^^', res, v), ret(r) self.where = was;
end return par('^^', res, v), ret(r)
end
need_scene = true; need_scene = true;
if ref(where) ~= ref(self.where) then -- jump !!! if ref(where) ~= ref(self.where) then -- jump !!!
need_scene = false; need_scene = false;
end
end end
res = par('^^',res,v); res = par('^^',res,v);