From 5f3c6daf412af923477a58be480a8c618998be73 Mon Sep 17 00:00:00 2001
From: "p.kosyh@gmail.com"
Date: Thu, 12 May 2011 19:55:13 +0000
Subject: [PATCH] going to 1.4.1
---
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 +-
instead.spec | 2 +-
readme.txt | 2 +-
setup-kit.iss | 4 ++--
setup.iss | 4 ++--
src/sdl-instead/s60.h | 2 +-
stead/object.lua | 2 +-
stead/stead.lua | 2 +-
18 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/Makefile.mingw32ce b/Makefile.mingw32ce
index 3886bd4..a03b02e 100644
--- a/Makefile.mingw32ce
+++ b/Makefile.mingw32ce
@@ -1,4 +1,4 @@
-VERSION := 1.4.0
+VERSION := 1.4.1
PREFIX=./
DESTDIR=
diff --git a/PKGBUILD.in b/PKGBUILD.in
index 2e1a751..01f18b7 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -1,6 +1,6 @@
# Contributor: Peter Kosyh
pkgname=instead
-pkgver=1.4.0
+pkgver=1.4.1
pkgrel=1
pkgdesc="instead quest interpreter"
arch=('i686' 'x86_64')
diff --git a/Rules.make.macosx b/Rules.make.macosx
index 36698e3..14e4277 100644
--- a/Rules.make.macosx
+++ b/Rules.make.macosx
@@ -1,4 +1,4 @@
-VERSION := 1.4.0
+VERSION := 1.4.1
DESTDIR=
BIN=
diff --git a/Rules.make.standalone b/Rules.make.standalone
index 5882f6e..1fa0513 100644
--- a/Rules.make.standalone
+++ b/Rules.make.standalone
@@ -1,4 +1,4 @@
-VERSION := 1.4.0
+VERSION := 1.4.1
DESTDIR=
BIN=
diff --git a/Rules.make.system b/Rules.make.system
index 94fa232..3f2dedb 100644
--- a/Rules.make.system
+++ b/Rules.make.system
@@ -1,4 +1,4 @@
-VERSION := 1.4.0
+VERSION := 1.4.1
PREFIX=/usr/local
DESTDIR=
diff --git a/Rules.mingw b/Rules.mingw
index f904f37..e7a8c98 100644
--- a/Rules.mingw
+++ b/Rules.mingw
@@ -1,4 +1,4 @@
-VERSION := 1.4.0
+VERSION := 1.4.1
PREFIX=./
DESTDIR=
diff --git a/Rules.windows b/Rules.windows
index c2bdf29..8018b79 100644
--- a/Rules.windows
+++ b/Rules.windows
@@ -1,4 +1,4 @@
-VERSION := 1.4.0
+VERSION := 1.4.1
PREFIX=
DESTDIR=
diff --git a/debian/changelog b/debian/changelog
index bff1fc9..3a7b3af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+instead (1.4.1) unstable; urgency=low
+
+ * bug fix in use;
+
+ -- Peter Kosyh Thu, 12 May 2011 23:53:00 +0400
+
instead (1.4.0) unstable; urgency=low
* bug fix in imgl/imgr;
diff --git a/desktop/instead.desktop.in b/desktop/instead.desktop.in
index 686ab80..3804305 100644
--- a/desktop/instead.desktop.in
+++ b/desktop/instead.desktop.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Version=1.4.0
+Version=1.4.1
Type=Application
Name=INSTEAD
Name[ru]=INSTEAD
diff --git a/doc/index.html b/doc/index.html
index d79f763..cd693b3 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.0
+INSTEAD 1.4.1
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 61b0800..0fa77c5 100644
--- a/doc/instead.6
+++ b/doc/instead.6
@@ -1,4 +1,4 @@
-.TH INSTEAD 6 "Version 1.4.0" Instead GAMES
+.TH INSTEAD 6 "Version 1.4.1" Instead GAMES
.SH NAME
diff --git a/instead.spec b/instead.spec
index afab46c..be6ac93 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.0
+Version: 1.4.1
Release: 1%{?dist}
License: GPLv2
URL: http://instead.googlecode.com
diff --git a/readme.txt b/readme.txt
index d421d42..e7cb593 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-INSTEAD 1.4.0
+INSTEAD 1.4.1
=============
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 e2d59fe..3677ce4 100644
--- a/setup-kit.iss
+++ b/setup-kit.iss
@@ -1,11 +1,11 @@
[Setup]
AppName=INSTEAD-KIT
-AppVerName=INSTEAD 1.4.0
+AppVerName=INSTEAD 1.4.1
DefaultDirName={pf}\Pinebrush games\INSTEAD
DefaultGroupName=Pinebrush games
UninstallDisplayIcon={app}\sdl-instead.exe
OutputDir=.
-OutputBaseFilename=instead-kit-1.4.0
+OutputBaseFilename=instead-kit-1.4.1
AllowNoIcons=true
[Languages]
diff --git a/setup.iss b/setup.iss
index 8777481..f6251ac 100644
--- a/setup.iss
+++ b/setup.iss
@@ -1,11 +1,11 @@
[Setup]
AppName=INSTEAD
-AppVerName=INSTEAD 1.4.0
+AppVerName=INSTEAD 1.4.1
DefaultDirName={pf}\Pinebrush games\INSTEAD
DefaultGroupName=Pinebrush games
UninstallDisplayIcon={app}\sdl-instead.exe
OutputDir=.
-OutputBaseFilename=instead-1.4.0
+OutputBaseFilename=instead-1.4.1
AllowNoIcons=true
SetupIconFile=icon\sdl_instead.ico
ChangesAssociations=yes
diff --git a/src/sdl-instead/s60.h b/src/sdl-instead/s60.h
index 8034674..4267dc5 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.0"
+#define VERSION "1.4.1"
#define DATAPATH "./"
#define STEAD_PATH DATAPATH"stead/"
#define THEMES_PATH DATAPATH"themes/"
diff --git a/stead/object.lua b/stead/object.lua
index 6d10523..36b3380 100644
--- a/stead/object.lua
+++ b/stead/object.lua
@@ -61,7 +61,7 @@ function player_use(self, what, onwhat, ...)
if not v and not vv then
v, r = call(game, 'use', obj, obj2, ...);
end
- if v == nil and vv == nil then
+ if not v and not vv then
return
end
v = stead.par(' ', v, vv);
diff --git a/stead/stead.lua b/stead/stead.lua
index 519b98b..58979fe 100644
--- a/stead/stead.lua
+++ b/stead/stead.lua
@@ -1,5 +1,5 @@
stead = {
- version = "1.4.0",
+ version = "1.4.1",
api_version = "1.1.6", -- last version before 1.2.0
table = table,
delim = ',',