fixes 1.3.1
This commit is contained in:
parent
0bc396a53b
commit
a1c4468c59
|
@ -1,4 +1,4 @@
|
|||
VERSION := 1.3.0
|
||||
VERSION := 1.3.1
|
||||
|
||||
PREFIX=./
|
||||
DESTDIR=
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Contributor: Peter Kosyh <p.kosyhgmail.com>
|
||||
pkgname=instead
|
||||
pkgver=1.3.0
|
||||
pkgver=1.3.1
|
||||
pkgrel=1
|
||||
pkgdesc="instead quest interpreter"
|
||||
arch=('i686' 'x86_64')
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
VERSION := 1.3.0
|
||||
VERSION := 1.3.1
|
||||
|
||||
DESTDIR=
|
||||
BIN=
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
VERSION := 1.3.0
|
||||
VERSION := 1.3.1
|
||||
|
||||
DESTDIR=
|
||||
BIN=
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
VERSION := 1.3.0
|
||||
VERSION := 1.3.1
|
||||
|
||||
PREFIX=/usr/local
|
||||
DESTDIR=
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
VERSION := 1.3.0
|
||||
VERSION := 1.3.1
|
||||
|
||||
PREFIX=./
|
||||
DESTDIR=
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
VERSION := 1.3.0
|
||||
VERSION := 1.3.1
|
||||
|
||||
PREFIX=
|
||||
DESTDIR=
|
||||
|
|
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -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
|
||||
|
||||
* bug fix (resample sounds while HZ change);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Version=1.3.0
|
||||
Version=1.3.1
|
||||
Type=Application
|
||||
Name=INSTEAD
|
||||
Name[ru]=INSTEAD
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
Summary: simply text adventures/visual novels engine and game
|
||||
Name: instead
|
||||
Version: 1.3.0
|
||||
Version: 1.3.1
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
URL: http://instead.googlecode.com
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
[Setup]
|
||||
AppName=INSTEAD-KIT
|
||||
AppVerName=INSTEAD 1.3.0
|
||||
AppVerName=INSTEAD 1.3.1
|
||||
DefaultDirName={pf}\Pinebrush games\INSTEAD
|
||||
DefaultGroupName=Pinebrush games
|
||||
UninstallDisplayIcon={app}\sdl-instead.exe
|
||||
OutputDir=.
|
||||
OutputBaseFilename=instead-kit-1.3.0
|
||||
OutputBaseFilename=instead-kit-1.3.1
|
||||
AllowNoIcons=true
|
||||
|
||||
[Languages]
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
[Setup]
|
||||
AppName=INSTEAD
|
||||
AppVerName=INSTEAD 1.3.0
|
||||
AppVerName=INSTEAD 1.3.1
|
||||
DefaultDirName={pf}\Pinebrush games\INSTEAD
|
||||
DefaultGroupName=Pinebrush games
|
||||
UninstallDisplayIcon={app}\sdl-instead.exe
|
||||
OutputDir=.
|
||||
OutputBaseFilename=instead-1.3.0
|
||||
OutputBaseFilename=instead-1.3.1
|
||||
AllowNoIcons=true
|
||||
|
||||
[Languages]
|
||||
|
|
|
@ -1408,6 +1408,20 @@ struct line *line_new(void)
|
|||
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)
|
||||
{
|
||||
int x = 0;
|
||||
|
@ -3220,7 +3234,7 @@ void _txt_layout_add(layout_t lay, char *txt)
|
|||
}
|
||||
nl = !*p;
|
||||
|
||||
if (!line->h && !img_align && !line->num) /* first word ? */
|
||||
if (!line->h && !img_align && line_empty(line)) /* first word ? */
|
||||
line->h = h;
|
||||
|
||||
if (img_align && !line->w)
|
||||
|
@ -3266,7 +3280,7 @@ void _txt_layout_add(layout_t lay, char *txt)
|
|||
goto err;
|
||||
}
|
||||
word->valign = layout->valign;
|
||||
if (!sp && line->num)
|
||||
if (!sp && !line_empty(line))
|
||||
word->unbrake = 1;
|
||||
|
||||
word->style = layout->style;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
stead = {
|
||||
version = "1.3.0",
|
||||
version = "1.3.1",
|
||||
api_version = "1.1.6", -- last version before 1.2.0
|
||||
table = table,
|
||||
delim = ',',
|
||||
|
|
Loading…
Reference in a new issue