diff --git a/Rules.make.standalone b/Rules.make.standalone index 2da57e7..22c9a4b 100644 --- a/Rules.make.standalone +++ b/Rules.make.standalone @@ -1,4 +1,4 @@ -VERSION := \"0.8.5\" +VERSION := \"0.8.6\" DESTDIR= BIN= diff --git a/Rules.make.system b/Rules.make.system index 5f7ff96..4dffdee 100644 --- a/Rules.make.system +++ b/Rules.make.system @@ -1,4 +1,4 @@ -VERSION := \"0.8.5\" +VERSION := \"0.8.6\" DESTDIR=/usr/local BIN=$(DESTDIR)/bin/ diff --git a/Rules.windows b/Rules.windows index 578359b..6e902f7 100644 --- a/Rules.windows +++ b/Rules.windows @@ -1,4 +1,4 @@ -VERSION := \"0.8.5\" +VERSION := \"0.8.6\" DESTDIR= BIN=..\..\bin\\ diff --git a/debian/changelog b/debian/changelog index 9f8492a..608f292 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +instead (0.8.6) unstable; urgency=low + + * cat game fixes + * seen extra parameter + + -- Peter Kosyh Thu, 27 Aug 2009 08:32:00 +0400 + instead (0.8.5) unstable; urgency=low * possible segfaults in timer functions. diff --git a/desktop/instead.desktop.in b/desktop/instead.desktop.in index 482ce9c..366374b 100644 --- a/desktop/instead.desktop.in +++ b/desktop/instead.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=0.8.5 +Version=0.8.6 Type=Application Name=INSTEAD Name[ru]=INSTEAD diff --git a/games/cat/ep1.lua b/games/cat/ep1.lua index f85ca7b..768ac27 100644 --- a/games/cat/ep1.lua +++ b/games/cat/ep1.lua @@ -355,7 +355,12 @@ forest = room { home = room { nam = 'хижина', - pic ="gfx/house.png", + pic = function(s) + if not seen('mycat') then + return "gfx/house-empty.png" + end + return "gfx/house.png"; + end, dsc = [[ В этой хижине я провел 10 лет. 10 лет назад я своими руками построил ее. Довольно тесно, но уютно.]], obj = { 'fireplace', 'mytable', 'foto', 'mycat', 'gun', diff --git a/games/cat/gfx/house-empty.png b/games/cat/gfx/house-empty.png new file mode 100644 index 0000000..2f63655 Binary files /dev/null and b/games/cat/gfx/house-empty.png differ diff --git a/stead/stead.lua b/stead/stead.lua index 1846a68..c89efb7 100644 --- a/stead/stead.lua +++ b/stead/stead.lua @@ -1247,7 +1247,7 @@ function game_step(self) return game_life(self); end -version = "0.8"; +version = "0.8.6"; game = game { nam = "INSTEAD -- Simple Text Adventure interpreter v"..version.." '2009 by Peter Kosyh", @@ -1622,8 +1622,13 @@ function dropf(obj) return o; end -function seen(obj) - local o,w = here().obj:srch(obj); +function seen(obj, wh) + if not wh then + wh = here(); + else + wh = ref(wh); + end + local o,w = wh.obj:srch(obj); o = ref(o); if isObject(o) then return o,w