From 18c7d1090775e7c4a4cb9c9e088d69425390c3f2 Mon Sep 17 00:00:00 2001
From: "p.kosyh"
Date: Sun, 13 Feb 2011 13:39:20 +0000
Subject: [PATCH] 1.3.1.1 up
---
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 | 8 ++++++++
games/tutorial2/main.lua | 1 +
instead.spec | 2 +-
setup-kit.iss | 4 ++--
setup.iss | 4 ++--
src/sdl-instead/graphics.c | 2 +-
src/sdl-instead/main.c | 2 ++
14 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/Makefile.mingw32ce b/Makefile.mingw32ce
index 404579a..d6b79d4 100644
--- a/Makefile.mingw32ce
+++ b/Makefile.mingw32ce
@@ -1,4 +1,4 @@
-VERSION := 1.3.1
+VERSION := 1.3.1.1
PREFIX=./
DESTDIR=
diff --git a/PKGBUILD.in b/PKGBUILD.in
index 128d588..12a2d34 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -1,6 +1,6 @@
# Contributor: Peter Kosyh
pkgname=instead
-pkgver=1.3.1
+pkgver=1.3.1.1
pkgrel=1
pkgdesc="instead quest interpreter"
arch=('i686' 'x86_64')
diff --git a/Rules.make.macosx b/Rules.make.macosx
index c6c7f37..e3e35ed 100644
--- a/Rules.make.macosx
+++ b/Rules.make.macosx
@@ -1,4 +1,4 @@
-VERSION := 1.3.1
+VERSION := 1.3.1.1
DESTDIR=
BIN=
diff --git a/Rules.make.standalone b/Rules.make.standalone
index 413f10f..a0be2e3 100644
--- a/Rules.make.standalone
+++ b/Rules.make.standalone
@@ -1,4 +1,4 @@
-VERSION := 1.3.1
+VERSION := 1.3.1.1
DESTDIR=
BIN=
diff --git a/Rules.make.system b/Rules.make.system
index f4e36e0..6d24dd7 100644
--- a/Rules.make.system
+++ b/Rules.make.system
@@ -1,4 +1,4 @@
-VERSION := 1.3.1
+VERSION := 1.3.1.1
PREFIX=/usr/local
DESTDIR=
diff --git a/Rules.mingw b/Rules.mingw
index 4a3dc02..c627d38 100644
--- a/Rules.mingw
+++ b/Rules.mingw
@@ -1,4 +1,4 @@
-VERSION := 1.3.1
+VERSION := 1.3.1.1
PREFIX=./
DESTDIR=
diff --git a/Rules.windows b/Rules.windows
index 80b91c1..b1dc820 100644
--- a/Rules.windows
+++ b/Rules.windows
@@ -1,4 +1,4 @@
-VERSION := 1.3.1
+VERSION := 1.3.1.1
PREFIX=
DESTDIR=
diff --git a/debian/changelog b/debian/changelog
index 734561b..33ee43d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+instead (1.3.1.1) unstable; urgency=low
+
+ * bug fix (dates in save slots);
+ * bug fix (dbg fixes);
+ * small bug fixes;
+
+ -- Peter Kosyh Mon, 14 Feb 2011 16:24:00 +0300
+
instead (1.3.1) unstable; urgency=low
* bug fix (imgl and justify);
diff --git a/games/tutorial2/main.lua b/games/tutorial2/main.lua
index 706a9fc..a996f48 100644
--- a/games/tutorial2/main.lua
+++ b/games/tutorial2/main.lua
@@ -1,4 +1,5 @@
-- $Name:Обучение$
+
instead_version "1.3.1"
require "dash" -- '--' replace :)
diff --git a/instead.spec b/instead.spec
index bee1989..d90fc4f 100644
--- a/instead.spec
+++ b/instead.spec
@@ -1,6 +1,6 @@
Summary: simply text adventures/visual novels engine and game
Name: instead
-Version: 1.3.1
+Version: 1.3.1.1
Release: 1%{?dist}
License: GPLv2
URL: http://instead.googlecode.com
diff --git a/setup-kit.iss b/setup-kit.iss
index 33fa14c..8b7408a 100644
--- a/setup-kit.iss
+++ b/setup-kit.iss
@@ -1,11 +1,11 @@
[Setup]
AppName=INSTEAD-KIT
-AppVerName=INSTEAD 1.3.1
+AppVerName=INSTEAD 1.3.1.1
DefaultDirName={pf}\Pinebrush games\INSTEAD
DefaultGroupName=Pinebrush games
UninstallDisplayIcon={app}\sdl-instead.exe
OutputDir=.
-OutputBaseFilename=instead-kit-1.3.1
+OutputBaseFilename=instead-kit-1.3.1.1
AllowNoIcons=true
[Languages]
diff --git a/setup.iss b/setup.iss
index 0470c81..b42535d 100644
--- a/setup.iss
+++ b/setup.iss
@@ -1,11 +1,11 @@
[Setup]
AppName=INSTEAD
-AppVerName=INSTEAD 1.3.1
+AppVerName=INSTEAD 1.3.1.1
DefaultDirName={pf}\Pinebrush games\INSTEAD
DefaultGroupName=Pinebrush games
UninstallDisplayIcon={app}\sdl-instead.exe
OutputDir=.
-OutputBaseFilename=instead-1.3.1
+OutputBaseFilename=instead-1.3.1.1
AllowNoIcons=true
[Languages]
diff --git a/src/sdl-instead/graphics.c b/src/sdl-instead/graphics.c
index 0901006..1d48f21 100644
--- a/src/sdl-instead/graphics.c
+++ b/src/sdl-instead/graphics.c
@@ -3229,7 +3229,7 @@ void _txt_layout_add(layout_t lay, char *txt)
while (ptr && *ptr) {
struct word *word;
- int sp2, addlen;
+ int sp2, addlen = 0;
int wtok;
eptr = process_token(ptr, layout, line, &xref, &sp2);
if (eptr) {
diff --git a/src/sdl-instead/main.c b/src/sdl-instead/main.c
index 493481a..0fabbc2 100644
--- a/src/sdl-instead/main.c
+++ b/src/sdl-instead/main.c
@@ -1,4 +1,6 @@
+#if defined(__APPLE__) || defined(S60)
#include
+#endif
#include "externals.h"
#include "internals.h"