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

nodsc

Browse source
This commit is contained in:
p.kosyh 2010-07-12 08:01:11 +00:00
parent 7572673117
commit f5d7abc895
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
stead/goto.lua
View file

@ -1,4 +1,4 @@
go = function (self, where, back, noenter, noexit) go = function (self, where, back, noenter, noexit, nodsc)
local was = self.where; local was = self.where;
local need_scene = false; local need_scene = false;
local ret local ret
@ -100,9 +100,8 @@ go = function (self, where, back, noenter, noexit)
end end
end end
PLAYER_MOVED = true PLAYER_MOVED = true
if need_scene then -- or isForcedsc(ref(where)) then -- i'am not sure... if need_scene and not nodsc then
NEED_SCENE = true NEED_SCENE = true
-- return par('^^',res,ref(where):scene());
end end
return res; return res;
end end
@ -127,8 +126,7 @@ end
function back() function back()
if isDialog(here()) and not isDialog(from()) then if isDialog(here()) and not isDialog(from()) then
local r, v = me():goto(from(), true, true); local r, v = me():goto(from(), true, true, false, true);
NEED_SCENE = false
return r,v; return r,v;
end end
return me():goto(from(), true); return me():goto(from(), true);
@ -140,8 +138,8 @@ function goback()
end end
stead.goback = goback stead.goback = goback
function goto(what, back, noenter, noexit, ...) function goto(what, back, noenter, noexit, nodsc, ...)
return me():goto(what, back, noenter, noexit, unpack(arg)); return me():goto(what, back, noenter, noexit, nodsc, unpack(arg));
end end
stead.goto = goto stead.goto = goto