oreolek/adventin
Archived
1
0
Fork 0
Code Pull requests Releases Activity

fixes

Browse source
This commit is contained in:
p.kosyh 2010-06-23 06:05:25 +00:00
parent bfab8d97a9
commit c8e91c66a6
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stead/goto.lua
View file

@ -91,7 +91,7 @@ end
go = hook(go, function(f, ...)
local r,v = f(unpack(arg))
if type(r) == 'string' then
if type(r) == 'string' and cctx() then
pr (r)
end
if stead.in_life_call then

15
stead/object.lua
View file

@ -64,21 +64,34 @@ function vobj_used(self, ...)
return call(ref(r),'used', self.nam, unpack(arg));
end
function vobj_use(self, ...)
local o, r = here():srch(self.nam);
return call(ref(r),'use', self.nam, unpack(arg));
end
function vobj(name, dsc, w)
return obj{ nam = tostring(name),
vobject_type = true,
dsc = dsc,
where = deref(w),
act = vobj_act,
used = vobj_used,
use = vobj_use,
save = vobj_save };
end
function vway(name, dsc, w)
-- o.object_type = true;
return obj{ nam = tostring(name),
vobject_type = true,
dsc = dsc,
act = vobj_act,
where = deref(w),
used = vobj_used,
used = vobj_used,
use = vobj_use,
save = vobj_save };
end
function isVobject(v)
return (type(v) == 'table') and (v.vobject_type)
end

6
stead/stead.lua
View file

@ -683,7 +683,7 @@ function call_bool(v, n, ...)
end
if type(v[n]) == 'function' then
callpush(v)
callpush(v, unpack(arg))
local r = v[n](v, unpack(arg));
callpop();
return r;
@ -1622,7 +1622,7 @@ function isForcedsc(v)
if r then
return true
end
g = call_bool(game, 'forcedsc');
g = call_bool(game, 'forcedsc', v);
return g and r ~= false
end
@ -1632,7 +1632,7 @@ function isSceneUse(v)
if o then
return true
end
g = call_bool(game, 'scene_use');
g = call_bool(game, 'scene_use', v);
return g and o ~= false
end