From e8f609e971b8ec66a8ab00fedbbd6cecf3674c01 Mon Sep 17 00:00:00 2001 From: "p.kosyh" Date: Sun, 29 May 2011 16:15:05 +0000 Subject: [PATCH] 1.4.2, kbd fix --- Makefile.mingw32ce | 2 +- PKGBUILD.in | 2 +- Rules.make.macosx | 2 +- Rules.make.standalone | 2 +- Rules.make.system | 2 +- Rules.mingw | 2 +- Rules.windows | 2 +- debian/changelog | 7 +++++++ desktop/instead.desktop.in | 2 +- doc/index.html | 2 +- doc/instead.6 | 2 +- instead.pkg | 2 +- instead.spec | 2 +- readme.txt | 2 +- setup-kit.iss | 4 ++-- setup.iss | 4 ++-- src/sdl-instead/game.c | 4 +--- src/sdl-instead/s60.h | 2 +- stead/stead.lua | 2 +- 19 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Makefile.mingw32ce b/Makefile.mingw32ce index a03b02e..8ab9620 100644 --- a/Makefile.mingw32ce +++ b/Makefile.mingw32ce @@ -1,4 +1,4 @@ -VERSION := 1.4.1 +VERSION := 1.4.2 PREFIX=./ DESTDIR= diff --git a/PKGBUILD.in b/PKGBUILD.in index 01f18b7..b21e536 100644 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -1,6 +1,6 @@ # Contributor: Peter Kosyh pkgname=instead -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=1 pkgdesc="instead quest interpreter" arch=('i686' 'x86_64') diff --git a/Rules.make.macosx b/Rules.make.macosx index 14e4277..e356a63 100644 --- a/Rules.make.macosx +++ b/Rules.make.macosx @@ -1,4 +1,4 @@ -VERSION := 1.4.1 +VERSION := 1.4.2 DESTDIR= BIN= diff --git a/Rules.make.standalone b/Rules.make.standalone index 1fa0513..1d71308 100644 --- a/Rules.make.standalone +++ b/Rules.make.standalone @@ -1,4 +1,4 @@ -VERSION := 1.4.1 +VERSION := 1.4.2 DESTDIR= BIN= diff --git a/Rules.make.system b/Rules.make.system index 3f2dedb..2e8c2db 100644 --- a/Rules.make.system +++ b/Rules.make.system @@ -1,4 +1,4 @@ -VERSION := 1.4.1 +VERSION := 1.4.2 PREFIX=/usr/local DESTDIR= diff --git a/Rules.mingw b/Rules.mingw index e7a8c98..2442819 100644 --- a/Rules.mingw +++ b/Rules.mingw @@ -1,4 +1,4 @@ -VERSION := 1.4.1 +VERSION := 1.4.2 PREFIX=./ DESTDIR= diff --git a/Rules.windows b/Rules.windows index 8018b79..f20348d 100644 --- a/Rules.windows +++ b/Rules.windows @@ -1,4 +1,4 @@ -VERSION := 1.4.1 +VERSION := 1.4.2 PREFIX= DESTDIR= diff --git a/debian/changelog b/debian/changelog index 3a7b3af..6c887f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +instead (1.4.2) unstable; urgency=low + + * bug fix in idf gets; + * bug fix in kbd hooking; + + -- Peter Kosyh Thu, 19 May 2011 20:14:00 +0400 + instead (1.4.1) unstable; urgency=low * bug fix in use; diff --git a/desktop/instead.desktop.in b/desktop/instead.desktop.in index 3804305..f399682 100644 --- a/desktop/instead.desktop.in +++ b/desktop/instead.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=1.4.1 +Version=1.4.2 Type=Application Name=INSTEAD Name[ru]=INSTEAD diff --git a/doc/index.html b/doc/index.html index cd693b3..16166e6 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.1

+

INSTEAD 1.4.2

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 0fa77c5..e00b405 100644 --- a/doc/instead.6 +++ b/doc/instead.6 @@ -1,4 +1,4 @@ -.TH INSTEAD 6 "Version 1.4.1" Instead GAMES +.TH INSTEAD 6 "Version 1.4.2" Instead GAMES .SH NAME diff --git a/instead.pkg b/instead.pkg index d7f39d4..429c7bd 100644 --- a/instead.pkg +++ b/instead.pkg @@ -8,7 +8,7 @@ &EN ; standard SIS file header -#{"INSTEAD"},(0xA0020410),1,4,1 +#{"INSTEAD"},(0xA0020410),1,4,2 ;Localised Vendor name %{"Peter Kosyh"} diff --git a/instead.spec b/instead.spec index be6ac93..e16fb89 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.1 +Version: 1.4.2 Release: 1%{?dist} License: GPLv2 URL: http://instead.googlecode.com diff --git a/readme.txt b/readme.txt index e7cb593..7141c13 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -INSTEAD 1.4.1 +INSTEAD 1.4.2 ============= 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 3677ce4..7016791 100644 --- a/setup-kit.iss +++ b/setup-kit.iss @@ -1,11 +1,11 @@ [Setup] AppName=INSTEAD-KIT -AppVerName=INSTEAD 1.4.1 +AppVerName=INSTEAD 1.4.2 DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultGroupName=Pinebrush games UninstallDisplayIcon={app}\sdl-instead.exe OutputDir=. -OutputBaseFilename=instead-kit-1.4.1 +OutputBaseFilename=instead-kit-1.4.2 AllowNoIcons=true [Languages] diff --git a/setup.iss b/setup.iss index f6251ac..0e666fd 100644 --- a/setup.iss +++ b/setup.iss @@ -1,11 +1,11 @@ [Setup] AppName=INSTEAD -AppVerName=INSTEAD 1.4.1 +AppVerName=INSTEAD 1.4.2 DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultGroupName=Pinebrush games UninstallDisplayIcon={app}\sdl-instead.exe OutputDir=. -OutputBaseFilename=instead-1.4.1 +OutputBaseFilename=instead-1.4.2 AllowNoIcons=true SetupIconFile=icon\sdl_instead.ico ChangesAssociations=yes diff --git a/src/sdl-instead/game.c b/src/sdl-instead/game.c index 2b10655..3e3252b 100644 --- a/src/sdl-instead/game.c +++ b/src/sdl-instead/game.c @@ -1757,7 +1757,7 @@ int game_cmd(char *cmd) // if (dd) game_cursor(CURSOR_CLEAR); - cmdstr = instead_cmd(cmd); rc = instead_bretval(1); instead_clear(); + cmdstr = instead_cmd(cmd); rc = !instead_bretval(1); instead_clear(); game_music_player(); game_sound_player(); @@ -1775,12 +1775,10 @@ int game_cmd(char *cmd) if (!cmdstr) { if (game_pict_modify(NULL)) /* redraw pic only */ game_redraw_pic(); - rc = (rc)?0:1; /* nothing happens? */ if (!rc) goto inv; /* hackish? ok, yes it is... */ goto err; /* really nothing to do */ } - fading = check_fading(); instead_function("instead.get_title", NULL); diff --git a/src/sdl-instead/s60.h b/src/sdl-instead/s60.h index 4267dc5..2f7d828 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.1" +#define VERSION "1.4.2" #define DATAPATH "./" #define STEAD_PATH DATAPATH"stead/" #define THEMES_PATH DATAPATH"themes/" diff --git a/stead/stead.lua b/stead/stead.lua index 58979fe..0fd4a72 100644 --- a/stead/stead.lua +++ b/stead/stead.lua @@ -1,5 +1,5 @@ stead = { - version = "1.4.1", + version = "1.4.2", api_version = "1.1.6", -- last version before 1.2.0 table = table, delim = ',',