oreolek/adventin
Archived
1
0
Fork 0
Code Pull requests Releases Activity

fixes 1.3.1

Browse source
This commit is contained in:
p.kosyh 2010-11-22 08:20:13 +00:00
parent 0bc396a53b
commit a1c4468c59
15 changed files with 37 additions and 17 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.3.0 VERSION := 1.3.1
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.3.0 pkgver=1.3.1
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.3.0 VERSION := 1.3.1
DESTDIR= DESTDIR=
BIN= BIN=

2
Rules.make.standalone
View file

@ -1,4 +1,4 @@
VERSION := 1.3.0 VERSION := 1.3.1
DESTDIR= DESTDIR=
BIN= BIN=

2
Rules.make.system
View file

@ -1,4 +1,4 @@
VERSION := 1.3.0 VERSION := 1.3.1
PREFIX=/usr/local PREFIX=/usr/local
DESTDIR= DESTDIR=

2
Rules.mingw
View file

@ -1,4 +1,4 @@
VERSION := 1.3.0 VERSION := 1.3.1
PREFIX=./ PREFIX=./
DESTDIR= DESTDIR=

2
Rules.windows
View file

@ -1,4 +1,4 @@
VERSION := 1.3.0 VERSION := 1.3.1
PREFIX= PREFIX=
DESTDIR= DESTDIR=

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
instead (1.3.1) unstable; urgency=low
* bug fix (imgl and justify);
-- Peter Kosyh <p.kosyh@gmail.com> Mon, 22 Nov 2010 11:17:00 +0300
instead (1.3.0) unstable; urgency=low instead (1.3.0) unstable; urgency=low
* bug fix (resample sounds while HZ change); * bug fix (resample sounds while HZ change);

2
desktop/instead.desktop.in
View file

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

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.3.0 Version: 1.3.1
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.3.0 INSTEAD 1.3.1
============= =============
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.3.0 AppVerName=INSTEAD 1.3.1
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.3.0 OutputBaseFilename=instead-kit-1.3.1
AllowNoIcons=true AllowNoIcons=true
[Languages] [Languages]

4
setup.iss
View file

@ -1,11 +1,11 @@
[Setup] [Setup]
AppName=INSTEAD AppName=INSTEAD
AppVerName=INSTEAD 1.3.0 AppVerName=INSTEAD 1.3.1
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.3.0 OutputBaseFilename=instead-1.3.1
AllowNoIcons=true AllowNoIcons=true
[Languages] [Languages]

18
src/sdl-instead/graphics.c
View file

@ -1408,6 +1408,20 @@ struct line *line_new(void)
return l; return l;
} }
int line_empty(struct line *line)
{
struct word *w;
w = line->words;
while (w) {
if (w->img_align) {
w = w->next;
continue;
}
return 0;
}
return 1;
}
void line_justify(struct line *line, int width) void line_justify(struct line *line, int width)
{ {
int x = 0; int x = 0;
@ -3220,7 +3234,7 @@ void _txt_layout_add(layout_t lay, char *txt)
} }
nl = !*p; nl = !*p;
if (!line->h && !img_align && !line->num) /* first word ? */ if (!line->h && !img_align && line_empty(line)) /* first word ? */
line->h = h; line->h = h;
if (img_align && !line->w) if (img_align && !line->w)
@ -3266,7 +3280,7 @@ void _txt_layout_add(layout_t lay, char *txt)
goto err; goto err;
} }
word->valign = layout->valign; word->valign = layout->valign;
if (!sp && line->num) if (!sp && !line_empty(line))
word->unbrake = 1; word->unbrake = 1;
word->style = layout->style; word->style = layout->style;

2
stead/stead.lua
View file

@ -1,5 +1,5 @@
stead = { stead = {
version = "1.3.0", version = "1.3.1",
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 = ',',