disp in gui mode only, enter/entered in main
This commit is contained in:
parent
f5d7abc895
commit
0bf05ebd90
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -24,6 +24,8 @@ instead (1.2.0) unstable; urgency=low
|
||||||
* visited() added;
|
* visited() added;
|
||||||
* live() added;
|
* live() added;
|
||||||
* nameof() added;
|
* nameof() added;
|
||||||
|
* goback() added;
|
||||||
|
* disp attribute added;
|
||||||
* improved debugger;
|
* improved debugger;
|
||||||
* save vars in _G;
|
* save vars in _G;
|
||||||
* no duplicated games while looking gamespaths;
|
* no duplicated games while looking gamespaths;
|
||||||
|
|
|
@ -204,6 +204,9 @@ end)
|
||||||
|
|
||||||
player = stead.inherit(player, function(v)
|
player = stead.inherit(player, function(v)
|
||||||
v.look = function(s)
|
v.look = function(s)
|
||||||
|
if game._time == 0 then
|
||||||
|
return stead.goto(here(), false, false, true);
|
||||||
|
end
|
||||||
NEED_SCENE = true
|
NEED_SCENE = true
|
||||||
end
|
end
|
||||||
return v
|
return v
|
||||||
|
|
|
@ -169,7 +169,10 @@ function list_str(self)
|
||||||
for i,o in opairs(self) do
|
for i,o in opairs(self) do
|
||||||
o = ref(o);
|
o = ref(o);
|
||||||
if isObject(o) and not isDisabled(o) then
|
if isObject(o) and not isDisabled(o) then
|
||||||
vv = call(o, 'disp');
|
vv = nil
|
||||||
|
if game.gui then
|
||||||
|
vv = call(o, 'disp');
|
||||||
|
end
|
||||||
if type(vv) ~= 'string' then
|
if type(vv) ~= 'string' then
|
||||||
vv = call(o, 'nam');
|
vv = call(o, 'nam');
|
||||||
end
|
end
|
||||||
|
@ -191,7 +194,10 @@ function obj_str(self)
|
||||||
for i,o in opairs(self.obj) do
|
for i,o in opairs(self.obj) do
|
||||||
o = ref(o);
|
o = ref(o);
|
||||||
if isObject(o) and not isDisabled(o) then
|
if isObject(o) and not isDisabled(o) then
|
||||||
vv = call(o, 'disp');
|
vv = nil
|
||||||
|
if game.gui then
|
||||||
|
vv = call(o, 'disp');
|
||||||
|
end
|
||||||
if type(vv) ~= 'string' then
|
if type(vv) ~= 'string' then
|
||||||
vv = call(o, 'nam');
|
vv = call(o, 'nam');
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue