cleanups
This commit is contained in:
parent
4c899b89cf
commit
294a447a9e
|
@ -16,8 +16,8 @@ LUA_LFLAGS=$(shell pkg-config --libs lua5.1)
|
||||||
|
|
||||||
# for arch linux, fedora (may be others) use this
|
# for arch linux, fedora (may be others) use this
|
||||||
#
|
#
|
||||||
LUA_CFLAGS=$(shell pkg-config --cflags lua)
|
# LUA_CFLAGS=$(shell pkg-config --cflags lua)
|
||||||
LUA_LFLAGS=$(shell pkg-config --libs lua)
|
# LUA_LFLAGS=$(shell pkg-config --libs lua)
|
||||||
#
|
#
|
||||||
|
|
||||||
SDL_CFLAGS=$(shell sdl-config --cflags)
|
SDL_CFLAGS=$(shell sdl-config --cflags)
|
||||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -7,6 +7,7 @@ instead (0.9.3) unstable; urgency=low
|
||||||
* new()/delete() (allocator object)
|
* new()/delete() (allocator object)
|
||||||
* game:ini() fix
|
* game:ini() fix
|
||||||
* theme scaling (yahoo!!!)
|
* theme scaling (yahoo!!!)
|
||||||
|
* scene_use attribute (scene objects using on each other)
|
||||||
|
|
||||||
-- Peter Kosyh <p.kosyh@gmail.com> Mon, 12 Oct 2009 11:09:19 +0400
|
-- Peter Kosyh <p.kosyh@gmail.com> Mon, 12 Oct 2009 11:09:19 +0400
|
||||||
|
|
||||||
|
|
|
@ -72,30 +72,37 @@ function cat(v,...)
|
||||||
end
|
end
|
||||||
|
|
||||||
function img(v)
|
function img(v)
|
||||||
|
if type(v) ~= 'string' then return nil; end;
|
||||||
return iface:img(v);
|
return iface:img(v);
|
||||||
end
|
end
|
||||||
|
|
||||||
function txtem(v)
|
function txtem(v)
|
||||||
|
if type(v) ~= 'string' then return nil; end;
|
||||||
return iface:em(v)
|
return iface:em(v)
|
||||||
end
|
end
|
||||||
|
|
||||||
function txtr(v)
|
function txtr(v)
|
||||||
|
if type(v) ~= 'string' then return nil; end;
|
||||||
return iface:right(v)
|
return iface:right(v)
|
||||||
end
|
end
|
||||||
|
|
||||||
function txtl(v)
|
function txtl(v)
|
||||||
|
if type(v) ~= 'string' then return nil; end;
|
||||||
return iface:left(v)
|
return iface:left(v)
|
||||||
end
|
end
|
||||||
|
|
||||||
function txtc(v)
|
function txtc(v)
|
||||||
|
if type(v) ~= 'string' then return nil; end;
|
||||||
return iface:center(v)
|
return iface:center(v)
|
||||||
end
|
end
|
||||||
|
|
||||||
function txtb(v)
|
function txtb(v)
|
||||||
|
if type(v) ~= 'string' then return nil; end;
|
||||||
return iface:bold(v)
|
return iface:bold(v)
|
||||||
end
|
end
|
||||||
|
|
||||||
function txtu(v)
|
function txtu(v)
|
||||||
|
if type(v) ~= 'string' then return nil; end;
|
||||||
return iface:under(v)
|
return iface:under(v)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1574,7 +1581,6 @@ iface = {
|
||||||
end
|
end
|
||||||
|
|
||||||
ACTION_TEXT = r; -- here, life methods can redefine this
|
ACTION_TEXT = r; -- here, life methods can redefine this
|
||||||
|
|
||||||
if st and v ~= false then
|
if st and v ~= false then
|
||||||
local av, pv -- av -- active lifes, pv -- background
|
local av, pv -- av -- active lifes, pv -- background
|
||||||
pv,av = game:step();
|
pv,av = game:step();
|
||||||
|
@ -1584,8 +1590,8 @@ iface = {
|
||||||
if isForcedsc(here()) then
|
if isForcedsc(here()) then
|
||||||
l,v = me():look();
|
l,v = me():look();
|
||||||
end
|
end
|
||||||
ACTION_TEXT = iface:em(ACTION_TEXT);
|
ACTION_TEXT = txtem(ACTION_TEXT);
|
||||||
vv = par("^^",iface:em(av), here():look(), iface:em(vv));
|
vv = par("^^",txtem(av), here():look(), txtem(vv));
|
||||||
else
|
else
|
||||||
vv = par("^^",av, here():look(), vv);
|
vv = par("^^",av, here():look(), vv);
|
||||||
end
|
end
|
||||||
|
@ -1670,6 +1676,7 @@ function ways(w)
|
||||||
end
|
end
|
||||||
|
|
||||||
function xref(str, obj)
|
function xref(str, obj)
|
||||||
|
if type(str) ~= 'string' then return nil; end;
|
||||||
return iface:xref(str, obj);
|
return iface:xref(str, obj);
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Reference in a new issue