From 75875d20c1fd027c3b120641ce27de498bc2fd3f Mon Sep 17 00:00:00 2001 From: "p.kosyh" Date: Wed, 15 Jun 2011 12:59:21 +0000 Subject: [PATCH] nopara logic --- 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 | 6 ++++++ desktop/instead.desktop.in | 2 +- doc/index.html | 2 +- doc/instead.6 | 2 +- games/tutorial2/main.lua | 5 +++-- instead.pkg | 2 +- instead.spec | 2 +- readme.txt | 2 +- setup-kit.iss | 4 ++-- setup.iss | 4 ++-- src/sdl-instead/s60.h | 2 +- stead/format.lua | 2 +- stead/stead.lua | 2 +- 20 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Makefile.mingw32ce b/Makefile.mingw32ce index 8ab9620..eeb2570 100644 --- a/Makefile.mingw32ce +++ b/Makefile.mingw32ce @@ -1,4 +1,4 @@ -VERSION := 1.4.2 +VERSION := 1.4.3 PREFIX=./ DESTDIR= diff --git a/PKGBUILD.in b/PKGBUILD.in index b21e536..4dbc292 100644 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -1,6 +1,6 @@ # Contributor: Peter Kosyh pkgname=instead -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc="instead quest interpreter" arch=('i686' 'x86_64') diff --git a/Rules.make.macosx b/Rules.make.macosx index e356a63..7bc84c6 100644 --- a/Rules.make.macosx +++ b/Rules.make.macosx @@ -1,4 +1,4 @@ -VERSION := 1.4.2 +VERSION := 1.4.3 DESTDIR= BIN= diff --git a/Rules.make.standalone b/Rules.make.standalone index 1d71308..a063876 100644 --- a/Rules.make.standalone +++ b/Rules.make.standalone @@ -1,4 +1,4 @@ -VERSION := 1.4.2 +VERSION := 1.4.3 DESTDIR= BIN= diff --git a/Rules.make.system b/Rules.make.system index 2e8c2db..86f5fdc 100644 --- a/Rules.make.system +++ b/Rules.make.system @@ -1,4 +1,4 @@ -VERSION := 1.4.2 +VERSION := 1.4.3 PREFIX=/usr/local DESTDIR= diff --git a/Rules.mingw b/Rules.mingw index 2442819..80b3e1f 100644 --- a/Rules.mingw +++ b/Rules.mingw @@ -1,4 +1,4 @@ -VERSION := 1.4.2 +VERSION := 1.4.3 PREFIX=./ DESTDIR= diff --git a/Rules.windows b/Rules.windows index f20348d..07ad996 100644 --- a/Rules.windows +++ b/Rules.windows @@ -1,4 +1,4 @@ -VERSION := 1.4.2 +VERSION := 1.4.3 PREFIX= DESTDIR= diff --git a/debian/changelog b/debian/changelog index 6c887f8..6f69e6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +instead (1.4.3) unstable; urgency=low + + * bug fix in nopara logic; + + -- Peter Kosyh Thu, 15 Jun 2011 16:56:00 +0400 + instead (1.4.2) unstable; urgency=low * bug fix in idf gets; diff --git a/desktop/instead.desktop.in b/desktop/instead.desktop.in index f399682..f2b5b7a 100644 --- a/desktop/instead.desktop.in +++ b/desktop/instead.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=1.4.2 +Version=1.4.3 Type=Application Name=INSTEAD Name[ru]=INSTEAD diff --git a/doc/index.html b/doc/index.html index 16166e6..a3bf9b7 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.2

+

INSTEAD 1.4.3

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 e00b405..81b052b 100644 --- a/doc/instead.6 +++ b/doc/instead.6 @@ -1,4 +1,4 @@ -.TH INSTEAD 6 "Version 1.4.2" Instead GAMES +.TH INSTEAD 6 "Version 1.4.3" Instead GAMES .SH NAME diff --git a/games/tutorial2/main.lua b/games/tutorial2/main.lua index a996f48..68e207d 100644 --- a/games/tutorial2/main.lua +++ b/games/tutorial2/main.lua @@ -10,12 +10,13 @@ game.act = 'Не получается.'; game.inv = "Гм.. Не то.."; game.use = 'Не сработает...'; -game.pic = 'instead.png'; +--game.pic = 'pad:15 0 0 0,instead.png'; set_music('ramparts.mod'); main = room { - nam = 'Обучение', + nam = true; --'Обучение', + pic = 'pics/instead.gif'; act = function() -- only one vobj, no check, just goto goto('r1'); end, diff --git a/instead.pkg b/instead.pkg index 429c7bd..7fc65be 100644 --- a/instead.pkg +++ b/instead.pkg @@ -8,7 +8,7 @@ &EN ; standard SIS file header -#{"INSTEAD"},(0xA0020410),1,4,2 +#{"INSTEAD"},(0xA0020410),1,4,3 ;Localised Vendor name %{"Peter Kosyh"} diff --git a/instead.spec b/instead.spec index e16fb89..7e9ac08 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.2 +Version: 1.4.3 Release: 1%{?dist} License: GPLv2 URL: http://instead.googlecode.com diff --git a/readme.txt b/readme.txt index 7141c13..df86d9b 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -INSTEAD 1.4.2 +INSTEAD 1.4.3 ============= 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 7016791..4ab65a6 100644 --- a/setup-kit.iss +++ b/setup-kit.iss @@ -1,11 +1,11 @@ [Setup] AppName=INSTEAD-KIT -AppVerName=INSTEAD 1.4.2 +AppVerName=INSTEAD 1.4.3 DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultGroupName=Pinebrush games UninstallDisplayIcon={app}\sdl-instead.exe OutputDir=. -OutputBaseFilename=instead-kit-1.4.2 +OutputBaseFilename=instead-kit-1.4.3 AllowNoIcons=true [Languages] diff --git a/setup.iss b/setup.iss index 0e666fd..182c9ab 100644 --- a/setup.iss +++ b/setup.iss @@ -1,11 +1,11 @@ [Setup] AppName=INSTEAD -AppVerName=INSTEAD 1.4.2 +AppVerName=INSTEAD 1.4.3 DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultGroupName=Pinebrush games UninstallDisplayIcon={app}\sdl-instead.exe OutputDir=. -OutputBaseFilename=instead-1.4.2 +OutputBaseFilename=instead-1.4.3 AllowNoIcons=true SetupIconFile=icon\sdl_instead.ico ChangesAssociations=yes diff --git a/src/sdl-instead/s60.h b/src/sdl-instead/s60.h index 2f7d828..ab31e25 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.2" +#define VERSION "1.4.3" #define DATAPATH "./" #define STEAD_PATH DATAPATH"stead/" #define THEMES_PATH DATAPATH"themes/" diff --git a/stead/format.lua b/stead/format.lua index 451826d..a87aa2a 100644 --- a/stead/format.lua +++ b/stead/format.lua @@ -40,7 +40,7 @@ stead.fmt = stead.hook(stead.fmt, function(f, ...) r = r:gsub(',,','„'):gsub("''",'”'); end if call_bool(format, 'para') then - r = r:gsub('\n([^\n])', '<¶>%1'):gsub('<¶>[ \t]*'..format.nopara,''):gsub('<¶>[ \t]*', '\n'..txtnb(format.para_space)); + r = r:gsub('\n([^\n])', '<¶>%1'):gsub('<¶>[ \t]*'..format.nopara,'\n'):gsub('<¶>[ \t]*', '\n'..txtnb(format.para_space)); r = r:gsub('^[ \t]*', '<¶>'):gsub('<¶>[ \t]*'..format.nopara,''):gsub('<¶>[ \t]*', txtnb(format.para_space)); end end diff --git a/stead/stead.lua b/stead/stead.lua index 0fd4a72..728dc20 100644 --- a/stead/stead.lua +++ b/stead/stead.lua @@ -1,5 +1,5 @@ stead = { - version = "1.4.2", + version = "1.4.3", api_version = "1.1.6", -- last version before 1.2.0 table = table, delim = ',',