oreolek/steed
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

nopara logic

Browse source
This commit is contained in:
p.kosyh 2011-06-15 12:59:21 +00:00
parent d2adb4a2bc
commit 75875d20c1
20 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.mingw32ce
View file

@ -1,4 +1,4 @@
VERSION := 1.4.2 VERSION := 1.4.3
PREFIX=./ PREFIX=./
DESTDIR= DESTDIR=

2
PKGBUILD.in
View file

@ -1,6 +1,6 @@
# Contributor: Peter Kosyh <p.kosyhgmail.com> # Contributor: Peter Kosyh <p.kosyhgmail.com>
pkgname=instead pkgname=instead
pkgver=1.4.2 pkgver=1.4.3
pkgrel=1 pkgrel=1
pkgdesc="instead quest interpreter" pkgdesc="instead quest interpreter"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')

2
Rules.make.macosx
View file

@ -1,4 +1,4 @@
VERSION := 1.4.2 VERSION := 1.4.3
DESTDIR= DESTDIR=
BIN= BIN=

2
Rules.make.standalone
View file

@ -1,4 +1,4 @@
VERSION := 1.4.2 VERSION := 1.4.3
DESTDIR= DESTDIR=
BIN= BIN=

2
Rules.make.system
View file

@ -1,4 +1,4 @@
VERSION := 1.4.2 VERSION := 1.4.3
PREFIX=/usr/local PREFIX=/usr/local
DESTDIR= DESTDIR=

2
Rules.mingw
View file

@ -1,4 +1,4 @@
VERSION := 1.4.2 VERSION := 1.4.3
PREFIX=./ PREFIX=./
DESTDIR= DESTDIR=

2
Rules.windows
View file

@ -1,4 +1,4 @@
VERSION := 1.4.2 VERSION := 1.4.3
PREFIX= PREFIX=
DESTDIR= DESTDIR=

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
instead (1.4.3) unstable; urgency=low
* bug fix in nopara logic;
-- Peter Kosyh <p.kosyh@gmail.com> Thu, 15 Jun 2011 16:56:00 +0400
instead (1.4.2) unstable; urgency=low instead (1.4.2) unstable; urgency=low
* bug fix in idf gets; * bug fix in idf gets;

2
desktop/instead.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Version=1.4.2 Version=1.4.3
Type=Application Type=Application
Name=INSTEAD Name=INSTEAD
Name[ru]=INSTEAD Name[ru]=INSTEAD

2
doc/index.html
View file

@ -13,7 +13,7 @@ body { font-family: Verdana, Arial, Helvetica, sans-serif;
</style> </style>
<title>INSTEAD -- interpreter of simple text adventures for Unix and Windows</title> <title>INSTEAD -- interpreter of simple text adventures for Unix and Windows</title>
</head><body bgcolor="#f0f0f0"> </head><body bgcolor="#f0f0f0">
<h2>INSTEAD 1.4.2</h2> <h2>INSTEAD 1.4.3</h2>
<p>INSTEAD -- interpreter of simple text adventures for Unix and Windows.<br> <p>INSTEAD -- interpreter of simple text adventures for Unix and Windows.<br>
INSTEAD was designed to interpret the games that are the mix of visual novels, text quests and classical 90'ss quests.</p> INSTEAD was designed to interpret the games that are the mix of visual novels, text quests and classical 90'ss quests.</p>

2
doc/instead.6
View file

@ -1,4 +1,4 @@
.TH INSTEAD 6 "Version 1.4.2" Instead GAMES .TH INSTEAD 6 "Version 1.4.3" Instead GAMES
.SH NAME .SH NAME

5
games/tutorial2/main.lua
View file

@ -10,12 +10,13 @@ game.act = 'Не получается.';
game.inv = "Гм.. Не то.."; game.inv = "Гм.. Не то..";
game.use = 'Не сработает...'; game.use = 'Не сработает...';
game.pic = 'instead.png'; --game.pic = 'pad:15 0 0 0,instead.png';
set_music('ramparts.mod'); set_music('ramparts.mod');
main = room { main = room {
nam = 'Обучение', nam = true; --'Обучение',
pic = 'pics/instead.gif';
act = function() -- only one vobj, no check, just goto act = function() -- only one vobj, no check, just goto
goto('r1'); goto('r1');
end, end,

2
instead.pkg
View file

@ -8,7 +8,7 @@
&EN &EN
; standard SIS file header ; standard SIS file header
#{"INSTEAD"},(0xA0020410),1,4,2 #{"INSTEAD"},(0xA0020410),1,4,3
;Localised Vendor name ;Localised Vendor name
%{"Peter Kosyh"} %{"Peter Kosyh"}

2
instead.spec
View file

@ -1,6 +1,6 @@
Summary: simply text adventures/visual novels engine and game Summary: simply text adventures/visual novels engine and game
Name: instead Name: instead
Version: 1.4.2 Version: 1.4.3
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
URL: http://instead.googlecode.com URL: http://instead.googlecode.com

2
readme.txt
View file

@ -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): WARNING! For successfull building you must install these development packages (names may vary in your distribution):

4
setup-kit.iss
View file

@ -1,11 +1,11 @@
[Setup] [Setup]
AppName=INSTEAD-KIT AppName=INSTEAD-KIT
AppVerName=INSTEAD 1.4.2 AppVerName=INSTEAD 1.4.3
DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultDirName={pf}\Pinebrush games\INSTEAD
DefaultGroupName=Pinebrush games DefaultGroupName=Pinebrush games
UninstallDisplayIcon={app}\sdl-instead.exe UninstallDisplayIcon={app}\sdl-instead.exe
OutputDir=. OutputDir=.
OutputBaseFilename=instead-kit-1.4.2 OutputBaseFilename=instead-kit-1.4.3
AllowNoIcons=true AllowNoIcons=true
[Languages] [Languages]

4
setup.iss
View file

@ -1,11 +1,11 @@
[Setup] [Setup]
AppName=INSTEAD AppName=INSTEAD
AppVerName=INSTEAD 1.4.2 AppVerName=INSTEAD 1.4.3
DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultDirName={pf}\Pinebrush games\INSTEAD
DefaultGroupName=Pinebrush games DefaultGroupName=Pinebrush games
UninstallDisplayIcon={app}\sdl-instead.exe UninstallDisplayIcon={app}\sdl-instead.exe
OutputDir=. OutputDir=.
OutputBaseFilename=instead-1.4.2 OutputBaseFilename=instead-1.4.3
AllowNoIcons=true AllowNoIcons=true
SetupIconFile=icon\sdl_instead.ico SetupIconFile=icon\sdl_instead.ico
ChangesAssociations=yes ChangesAssociations=yes

2
src/sdl-instead/s60.h
View file

@ -1,7 +1,7 @@
#ifndef S60_H #ifndef S60_H
#define S60_H #define S60_H
#define PATH_MAX 256 #define PATH_MAX 256
#define VERSION "1.4.2" #define VERSION "1.4.3"
#define DATAPATH "./" #define DATAPATH "./"
#define STEAD_PATH DATAPATH"stead/" #define STEAD_PATH DATAPATH"stead/"
#define THEMES_PATH DATAPATH"themes/" #define THEMES_PATH DATAPATH"themes/"

2
stead/format.lua
View file

@ -40,7 +40,7 @@ stead.fmt = stead.hook(stead.fmt, function(f, ...)
r = r:gsub(',,','„'):gsub("''",'”'); r = r:gsub(',,','„'):gsub("''",'”');
end end
if call_bool(format, 'para') then if call_bool(format, 'para') then
r = r:gsub('\n([^\n])', '<&para;>%1'):gsub('<&para;>[ \t]*'..format.nopara,''):gsub('<&para;>[ \t]*', '\n'..txtnb(format.para_space)); r = r:gsub('\n([^\n])', '<&para;>%1'):gsub('<&para;>[ \t]*'..format.nopara,'\n'):gsub('<&para;>[ \t]*', '\n'..txtnb(format.para_space));
r = r:gsub('^[ \t]*', '<&para;>'):gsub('<&para;>[ \t]*'..format.nopara,''):gsub('<&para;>[ \t]*', txtnb(format.para_space)); r = r:gsub('^[ \t]*', '<&para;>'):gsub('<&para;>[ \t]*'..format.nopara,''):gsub('<&para;>[ \t]*', txtnb(format.para_space));
end end
end end

2
stead/stead.lua
View file

@ -1,5 +1,5 @@
stead = { stead = {
version = "1.4.2", version = "1.4.3",
api_version = "1.1.6", -- last version before 1.2.0 api_version = "1.1.6", -- last version before 1.2.0
table = table, table = table,
delim = ',', delim = ',',