diff --git a/PKGBUILD.in b/PKGBUILD.in index ec2c9b4..48f2ad6 100644 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -1,6 +1,6 @@ # Contributor: Peter Kosyh pkgname=instead -pkgver=1.4.5 +pkgver=1.4.6 pkgrel=1 pkgdesc="instead quest interpreter" arch=('i686' 'x86_64') diff --git a/README b/README index a8743d9..91eaef8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -INSTEAD 1.4.5 +INSTEAD 1.4.6 ============= WARNING! For successfull building you must install these development packages (names may vary in your distribution): diff --git a/Rules.make.macosx b/Rules.make.macosx index 891002f..60f5917 100644 --- a/Rules.make.macosx +++ b/Rules.make.macosx @@ -1,4 +1,4 @@ -VERSION := 1.4.5 +VERSION := 1.4.6 DESTDIR= BIN= diff --git a/Rules.make.mingw32ce b/Rules.make.mingw32ce index e036465..edef3c2 100644 --- a/Rules.make.mingw32ce +++ b/Rules.make.mingw32ce @@ -1,4 +1,4 @@ -VERSION := 1.4.5 +VERSION := 1.4.6 PREFIX= DESTDIR= diff --git a/Rules.make.standalone b/Rules.make.standalone index d307721..9780acd 100644 --- a/Rules.make.standalone +++ b/Rules.make.standalone @@ -1,4 +1,4 @@ -VERSION := 1.4.5 +VERSION := 1.4.6 DESTDIR= BIN= diff --git a/Rules.make.system b/Rules.make.system index 723e571..5ec3c7e 100644 --- a/Rules.make.system +++ b/Rules.make.system @@ -1,4 +1,4 @@ -VERSION := 1.4.5 +VERSION := 1.4.6 PREFIX=/usr/local DESTDIR= diff --git a/Rules.mingw b/Rules.mingw index 72b03ef..f799855 100644 --- a/Rules.mingw +++ b/Rules.mingw @@ -1,4 +1,4 @@ -VERSION := 1.4.5 +VERSION := 1.4.6 PREFIX=./ DESTDIR= diff --git a/Rules.windows b/Rules.windows index a40069d..23b15b7 100644 --- a/Rules.windows +++ b/Rules.windows @@ -1,4 +1,4 @@ -VERSION := 1.4.5 +VERSION := 1.4.6 PREFIX= DESTDIR= diff --git a/debian/changelog b/debian/changelog index 5149942..ace0d01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +instead (1.4.6) unstable; urgency=low + + * bug fix in gamefile; + * bug fix in lifes output; + + -- Peter Kosyh Mon, 09 Aug 2011 12:24:00 +0400 + instead (1.4.5) unstable; urgency=low * bug fix in rnd() w/o parameter; diff --git a/desktop/instead.desktop.in b/desktop/instead.desktop.in index 67f7bc4..834496d 100644 --- a/desktop/instead.desktop.in +++ b/desktop/instead.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=1.4.5 +Version=1.4.6 Type=Application Name=INSTEAD Name[ru]=INSTEAD diff --git a/doc/index.html b/doc/index.html index 5420432..f8a47ac 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.5

+

INSTEAD 1.4.6

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 91ee947..30ed139 100644 --- a/doc/instead.6 +++ b/doc/instead.6 @@ -1,4 +1,4 @@ -.TH INSTEAD 6 "Version 1.4.5" Instead GAMES +.TH INSTEAD 6 "Version 1.4.6" Instead GAMES .SH NAME diff --git a/instead.pkg b/instead.pkg index 759f219..73c7fcd 100644 --- a/instead.pkg +++ b/instead.pkg @@ -8,7 +8,7 @@ &EN ; standard SIS file header -#{"INSTEAD"},(0xA0020410),1,4,5 +#{"INSTEAD"},(0xA0020410),1,4,6 ;Localised Vendor name %{"Peter Kosyh"} diff --git a/instead.spec b/instead.spec index 21e4f3c..6fc2ad6 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.5 +Version: 1.4.6 Release: 1%{?dist} License: GPLv2 URL: http://instead.googlecode.com diff --git a/setup-kit.iss b/setup-kit.iss index 028579d..dd8f0b7 100644 --- a/setup-kit.iss +++ b/setup-kit.iss @@ -1,11 +1,11 @@ [Setup] AppName=INSTEAD-KIT -AppVerName=INSTEAD 1.4.5 +AppVerName=INSTEAD 1.4.6 DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultGroupName=Pinebrush games UninstallDisplayIcon={app}\sdl-instead.exe OutputDir=. -OutputBaseFilename=instead-kit-1.4.5 +OutputBaseFilename=instead-kit-1.4.6 AllowNoIcons=true [Languages] diff --git a/setup.iss b/setup.iss index 41e28d1..e2bd9d1 100644 --- a/setup.iss +++ b/setup.iss @@ -1,11 +1,11 @@ [Setup] AppName=INSTEAD -AppVerName=INSTEAD 1.4.5 +AppVerName=INSTEAD 1.4.6 DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultGroupName=Pinebrush games UninstallDisplayIcon={app}\sdl-instead.exe OutputDir=. -OutputBaseFilename=instead-1.4.5 +OutputBaseFilename=instead-1.4.6 AllowNoIcons=true SetupIconFile=icon\sdl_instead.ico ChangesAssociations=yes diff --git a/src/sdl-instead/SDL_rotozoom.c b/src/sdl-instead/SDL_rotozoom.c index 5a20279..31bf2bc 100644 --- a/src/sdl-instead/SDL_rotozoom.c +++ b/src/sdl-instead/SDL_rotozoom.c @@ -91,7 +91,7 @@ Assumes dst surface was allocated with the correct dimensions. */ int _shrinkSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int factorx, int factory) { - int x, y, dx, dy, sgap, dgap, ra, ga, ba, aa; + int x, y, dx, dy, dgap, ra, ga, ba, aa; int n_average; tColorRGBA *sp, *osp, *oosp; tColorRGBA *dp; @@ -107,7 +107,7 @@ int _shrinkSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int factorx, int fa * Scan destination */ sp = (tColorRGBA *) src->pixels; - sgap = src->pitch - src->w * 4; +// sgap = src->pitch - src->w * 4; dp = (tColorRGBA *) dst->pixels; dgap = dst->pitch - dst->w * 4; @@ -180,7 +180,7 @@ Assumes dst surface was allocated with the correct dimensions. */ int _shrinkSurfaceY(SDL_Surface * src, SDL_Surface * dst, int factorx, int factory) { - int x, y, dx, dy, sgap, dgap, a; + int x, y, dx, dy, dgap, a; int n_average; Uint8 *sp, *osp, *oosp; Uint8 *dp; @@ -196,7 +196,7 @@ int _shrinkSurfaceY(SDL_Surface * src, SDL_Surface * dst, int factorx, int facto * Scan destination */ sp = (Uint8 *) src->pixels; - sgap = src->pitch - src->w; +// sgap = src->pitch - src->w; dp = (Uint8 *) dst->pixels; dgap = dst->pitch - dst->w; @@ -729,7 +729,7 @@ Assumes dst surface was allocated with the correct dimensions. */ void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy) { - int x, y, dx, dy, xd, yd, sdx, sdy, ax, ay, sw, sh; + int x, y, dx, dy, xd, yd, sdx, sdy, ax, ay; tColorY *pc, *sp; int gap; @@ -740,8 +740,8 @@ void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int yd = ((src->h - dst->h) << 15); ax = (cx << 16) - (icos * cx); ay = (cy << 16) - (isin * cx); - sw = src->w - 1; - sh = src->h - 1; +// sw = src->w - 1; +// sh = src->h - 1; pc = (tColorY*) dst->pixels; gap = dst->pitch - dst->w; /* diff --git a/src/sdl-instead/s60.h b/src/sdl-instead/s60.h index 594a945..583b20c 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.5" +#define VERSION "1.4.6" #define DATAPATH "./" #define STEAD_PATH DATAPATH"stead/" #define THEMES_PATH DATAPATH"themes/" diff --git a/stead/stead.lua b/stead/stead.lua index 060002d..812e371 100644 --- a/stead/stead.lua +++ b/stead/stead.lua @@ -1,5 +1,5 @@ stead = { - version = "1.4.5", + version = "1.4.6", api_version = "1.1.6", -- last version before 1.2.0 table = table, delim = ',', @@ -1477,6 +1477,10 @@ function game_life(self) if not isDisabled(o) then PLAYER_MOVED = false vv,pre = stead.call(o, 'life'); + if PLAYER_MOVED then -- clear life output, but not current + av = nil + v = nil + end if pre or (PLAYER_MOVED and pre ~= false) then av = stead.par(' ', av, vv); else @@ -1854,7 +1858,7 @@ function gamefile(file, forget) if forget then game:start() stead.started = true - return goto(here()); + return stead.goto(here(), false, false, true); end end