diff --git a/Makefile.mingw32ce b/Makefile.mingw32ce index 388c767..d34c726 100644 --- a/Makefile.mingw32ce +++ b/Makefile.mingw32ce @@ -1,4 +1,4 @@ -VERSION := 1.4.4 +VERSION := 1.4.5 PREFIX=./ DESTDIR= diff --git a/PKGBUILD.in b/PKGBUILD.in index db2a2f8..ec2c9b4 100644 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -1,6 +1,6 @@ # Contributor: Peter Kosyh pkgname=instead -pkgver=1.4.4 +pkgver=1.4.5 pkgrel=1 pkgdesc="instead quest interpreter" arch=('i686' 'x86_64') diff --git a/Rules.make.macosx b/Rules.make.macosx index efcab94..891002f 100644 --- a/Rules.make.macosx +++ b/Rules.make.macosx @@ -1,4 +1,4 @@ -VERSION := 1.4.4 +VERSION := 1.4.5 DESTDIR= BIN= diff --git a/Rules.make.standalone b/Rules.make.standalone index 3f4ed45..d307721 100644 --- a/Rules.make.standalone +++ b/Rules.make.standalone @@ -1,4 +1,4 @@ -VERSION := 1.4.4 +VERSION := 1.4.5 DESTDIR= BIN= diff --git a/Rules.make.system b/Rules.make.system index 68984b1..723e571 100644 --- a/Rules.make.system +++ b/Rules.make.system @@ -1,4 +1,4 @@ -VERSION := 1.4.4 +VERSION := 1.4.5 PREFIX=/usr/local DESTDIR= diff --git a/Rules.mingw b/Rules.mingw index 06f36e9..72b03ef 100644 --- a/Rules.mingw +++ b/Rules.mingw @@ -1,4 +1,4 @@ -VERSION := 1.4.4 +VERSION := 1.4.5 PREFIX=./ DESTDIR= diff --git a/Rules.windows b/Rules.windows index 9643d78..a40069d 100644 --- a/Rules.windows +++ b/Rules.windows @@ -1,4 +1,4 @@ -VERSION := 1.4.4 +VERSION := 1.4.5 PREFIX= DESTDIR= diff --git a/doc/index.html b/doc/index.html index 6a227cc..5420432 100644 --- a/doc/index.html +++ b/doc/index.html @@ -13,7 +13,7 @@ body { font-family: Verdana, Arial, Helvetica, sans-serif; INSTEAD -- interpreter of simple text adventures for Unix and Windows -

INSTEAD 1.4.4

+

INSTEAD 1.4.5

INSTEAD -- interpreter of simple text adventures for Unix and Windows.
INSTEAD was designed to interpret the games that are the mix of visual novels, text quests and classical 90'ss quests.

diff --git a/doc/instead.6 b/doc/instead.6 index 36ec85f..91ee947 100644 --- a/doc/instead.6 +++ b/doc/instead.6 @@ -1,4 +1,4 @@ -.TH INSTEAD 6 "Version 1.4.4" Instead GAMES +.TH INSTEAD 6 "Version 1.4.5" Instead GAMES .SH NAME diff --git a/instead.pkg b/instead.pkg index ab22e08..759f219 100644 --- a/instead.pkg +++ b/instead.pkg @@ -8,7 +8,7 @@ &EN ; standard SIS file header -#{"INSTEAD"},(0xA0020410),1,4,4 +#{"INSTEAD"},(0xA0020410),1,4,5 ;Localised Vendor name %{"Peter Kosyh"} diff --git a/instead.spec b/instead.spec index cd84b57..21e4f3c 100644 --- a/instead.spec +++ b/instead.spec @@ -1,6 +1,6 @@ Summary: simply text adventures/visual novels engine and game Name: instead -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} License: GPLv2 URL: http://instead.googlecode.com diff --git a/readme.txt b/readme.txt index cc6fb10..a8743d9 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -INSTEAD 1.4.4 +INSTEAD 1.4.5 ============= WARNING! For successfull building you must install these development packages (names may vary in your distribution): diff --git a/setup-kit.iss b/setup-kit.iss index 861c6ee..028579d 100644 --- a/setup-kit.iss +++ b/setup-kit.iss @@ -1,11 +1,11 @@ [Setup] AppName=INSTEAD-KIT -AppVerName=INSTEAD 1.4.4 +AppVerName=INSTEAD 1.4.5 DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultGroupName=Pinebrush games UninstallDisplayIcon={app}\sdl-instead.exe OutputDir=. -OutputBaseFilename=instead-kit-1.4.4 +OutputBaseFilename=instead-kit-1.4.5 AllowNoIcons=true [Languages] diff --git a/setup.iss b/setup.iss index 35925b0..41e28d1 100644 --- a/setup.iss +++ b/setup.iss @@ -1,11 +1,11 @@ [Setup] AppName=INSTEAD -AppVerName=INSTEAD 1.4.4 +AppVerName=INSTEAD 1.4.5 DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultGroupName=Pinebrush games UninstallDisplayIcon={app}\sdl-instead.exe OutputDir=. -OutputBaseFilename=instead-1.4.4 +OutputBaseFilename=instead-1.4.5 AllowNoIcons=true SetupIconFile=icon\sdl_instead.ico ChangesAssociations=yes diff --git a/src/sdl-instead/s60.h b/src/sdl-instead/s60.h index 8706c64..594a945 100644 --- a/src/sdl-instead/s60.h +++ b/src/sdl-instead/s60.h @@ -1,7 +1,7 @@ #ifndef S60_H #define S60_H #define PATH_MAX 256 -#define VERSION "1.4.4" +#define VERSION "1.4.5" #define DATAPATH "./" #define STEAD_PATH DATAPATH"stead/" #define THEMES_PATH DATAPATH"themes/" diff --git a/stead/goto.lua b/stead/goto.lua index f368e62..5a2d6fd 100644 --- a/stead/goto.lua +++ b/stead/goto.lua @@ -196,15 +196,15 @@ end stead.go = stead.hook(stead.go, function(f, ...) local r,v = f(...) - if type(r) == 'string' and stead.get_cctx() then + if type(r) == 'string' and stead.cctx() then pr (r) end if stead.in_life_call then ACTION_TEXT = nil end if r == nil and v == nil then - if stead.get_cctx() then - stead.get_cctx().action = true + if stead.cctx() then + stead.cctx().action = true else r = true end diff --git a/stead/snapshots.lua b/stead/snapshots.lua index e6c786a..3da88b4 100644 --- a/stead/snapshots.lua +++ b/stead/snapshots.lua @@ -39,7 +39,7 @@ stead.restore_snapshot = function (nr) i = do_ini(game, true); RAW_TEXT = true -- delete_snapshot(nr); - if stead.get_cctx() then + if stead.cctx() then pr(i) end return i; diff --git a/stead/stead.lua b/stead/stead.lua index a7ec3f6..520eaef 100644 --- a/stead/stead.lua +++ b/stead/stead.lua @@ -1,5 +1,5 @@ stead = { - version = "1.4.4", + version = "1.4.5", api_version = "1.1.6", -- last version before 1.2.0 table = table, delim = ',', @@ -13,7 +13,7 @@ stead = { os = os, readdir = readdir, call_top = 0, - cctx = { txt = nil, self = nil }, + call_ctx = { txt = nil, self = nil }, -- functions = {}, -- code blocks timer = function() if type(timer) == 'table' and type(timer.callback) == 'function' then @@ -94,15 +94,13 @@ stead.tostring = function(v) return v end -function cctx() - return stead.cctx[stead.call_top]; +stead.cctx = function() + return stead.call_ctx[stead.call_top]; end -stead.get_cctx = cctx - function callpush(v, ...) stead.call_top = stead.call_top + 1; - stead.cctx[stead.call_top] = { txt = nil, self = v, action = false }; + stead.call_ctx[stead.call_top] = { txt = nil, self = v, action = false }; args = {...}; arg1 = args[1] arg2 = args[2] @@ -135,7 +133,7 @@ end stead.clearargs = clearargs function callpop() - stead.cctx[stead.call_top] = nil; + stead.call_ctx[stead.call_top] = nil; stead.call_top = stead.call_top - 1; if stead.call_top < 0 then error ("callpush/callpop mismatch") @@ -145,34 +143,34 @@ end stead.callpop = callpop function pclr() - stead.get_cctx().txt = nil + stead.cctx().txt = nil end stead.pclr = pclr function pget() - return stead.get_cctx().txt; + return stead.cctx().txt; end stead.pget = pget function p(...) local i local a = {...} for i = 1, stead.table.maxn(a) do - stead.get_cctx().txt = stead.par('', stead.get_cctx().txt, tostring(a[i])); + stead.cctx().txt = stead.par('', stead.cctx().txt, tostring(a[i])); end - stead.get_cctx().txt = stead.cat(stead.get_cctx().txt, ' '); + stead.cctx().txt = stead.cat(stead.cctx().txt, ' '); end stead.p = p function pr(...) local i local a = {...} for i = 1, stead.table.maxn(a) do - stead.get_cctx().txt = stead.par('', stead.get_cctx().txt, tostring(a[i])); + stead.cctx().txt = stead.par('', stead.cctx().txt, tostring(a[i])); end end stead.pr = pr function pn(...) p(...); - stead.get_cctx().txt = stead.par('', stead.get_cctx().txt,'^'); + stead.cctx().txt = stead.par('', stead.cctx().txt,'^'); end stead.pn = pn -- merge strings with "space" as separator @@ -822,7 +820,7 @@ function call(v, n, ...) if type(a) == 'boolean' and b == nil then b, a = a, stead.pget() if a == nil then - if stead.get_cctx().action then + if stead.cctx().action then a = true else a = b @@ -833,7 +831,7 @@ function call(v, n, ...) a = stead.pget() b = nil end - if a == nil and b == nil and stead.get_cctx().action then + if a == nil and b == nil and stead.cctx().action then a = true end stead.callpop()