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

scene_use fixes

Browse source
This commit is contained in:
p.kosyh 2009-10-15 08:54:20 +00:00
parent 834d2af9bd
commit 56e7892630
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
stead/gui.lua
View file

@ -136,6 +136,3 @@ function isMenu(v)
return false return false
end end
function isSceneUse(v)
return call_bool(v, 'scene_use');
end

32
stead/stead.lua
View file

@ -911,21 +911,17 @@ end
function player_use(self, what, onwhat) function player_use(self, what, onwhat)
local obj, obj2, v, vv, r; local obj, obj2, v, vv, r;
local use_mode local scene_use_mode
obj = self:srch(what); obj = self:srch(what);
if not obj then if not obj then
if call_bool(game, 'scene_use') then obj = ref(self.where):srch(what);
use_mode = true if not obj then
obj = ref(self.where):srch(what);
if not obj then
return
end
else
return game.err, false; return game.err, false;
end end
scene_use_mode = true
end end
if onwhat == nil then if onwhat == nil then
if use_mode then if scene_use_mode then
return player_action(self, what); return player_action(self, what);
else else
v, r = call(ref(obj),'inv'); v, r = call(ref(obj),'inv');
@ -942,9 +938,11 @@ function player_use(self, what, onwhat)
if not obj2 or obj2 == obj then if not obj2 or obj2 == obj then
return game.err, false; return game.err, false;
end end
v, r = call(ref(obj), 'use', obj2); if not use_mode or isSceneUse(obj) then
if r ~= false then v, r = call(ref(obj), 'use', obj2);
vv = call(ref(obj2), 'used', obj); if r ~= false then
vv = call(ref(obj2), 'used', obj);
end
end end
if not v and not vv then if not v and not vv then
v, r = call(game, 'use', obj, obj2); v, r = call(game, 'use', obj, obj2);
@ -1401,6 +1399,16 @@ function isForcedsc(v)
return g and r ~= false return g and r ~= false
end end
function isSceneUse(v)
local o,g
o = call_bool(v, 'scene_use');
if o then
return true
end
g = call_bool(game, 'scene_use');
return g and o ~= false
end
iface = { iface = {
img = function(self, str) img = function(self, str)
return ''; return '';