From 029f951efa327c720eea1abd39902687e94b00c3 Mon Sep 17 00:00:00 2001
From: "p.kosyh"
Date: Thu, 3 Jun 2010 15:12:42 +0000
Subject: [PATCH] 1.2.0, savespath and SDL vs gtk hack
---
Rules.make.standalone | 2 +-
Rules.make.system | 2 +-
Rules.mingw | 2 +-
Rules.windows | 2 +-
debian/changelog | 2 +-
desktop/instead.desktop.in | 2 +-
doc/index.html | 2 +-
doc/instead.6 | 2 +-
readme.txt | 4 ++--
setup.iss | 4 ++--
src/sdl-instead/instead.c | 4 ++--
src/sdl-instead/unix.c | 2 +-
stead/stead.lua | 2 +-
13 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Rules.make.standalone b/Rules.make.standalone
index f9c22fe..2d49d3d 100644
--- a/Rules.make.standalone
+++ b/Rules.make.standalone
@@ -1,4 +1,4 @@
-VERSION := 1.2
+VERSION := 1.2.0
DESTDIR=
BIN=
diff --git a/Rules.make.system b/Rules.make.system
index 4c8ce8c..2e5bdf2 100644
--- a/Rules.make.system
+++ b/Rules.make.system
@@ -1,4 +1,4 @@
-VERSION := 1.2
+VERSION := 1.2.0
PREFIX=/usr/local
DESTDIR=
diff --git a/Rules.mingw b/Rules.mingw
index e0da033..fdcd026 100644
--- a/Rules.mingw
+++ b/Rules.mingw
@@ -1,4 +1,4 @@
-VERSION := 1.2
+VERSION := 1.2.0
PREFIX=./
DESTDIR=
diff --git a/Rules.windows b/Rules.windows
index 681ab96..4125b29 100644
--- a/Rules.windows
+++ b/Rules.windows
@@ -1,4 +1,4 @@
-VERSION := 1.2
+VERSION := 1.2.0
PREFIX=
DESTDIR=
diff --git a/debian/changelog b/debian/changelog
index e750354..f8b6fb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-instead (1.2) unstable; urgency=low
+instead (1.2.0) unstable; urgency=low
* unpack/install feature;
* browse feature (win32 and gtk);
diff --git a/desktop/instead.desktop.in b/desktop/instead.desktop.in
index 0616cc3..3a07ed3 100644
--- a/desktop/instead.desktop.in
+++ b/desktop/instead.desktop.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Version=1.2
+Version=1.2.0
Type=Application
Name=INSTEAD
Name[ru]=INSTEAD
diff --git a/doc/index.html b/doc/index.html
index 51f038e..8c2f3b0 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.2
+INSTEAD 1.2.0
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 1517060..c6896a9 100644
--- a/doc/instead.6
+++ b/doc/instead.6
@@ -1,4 +1,4 @@
-.TH INSTEAD 6 "Version 1.2" Instead GAMES
+.TH INSTEAD 6 "Version 1.2.0" Instead GAMES
.SH NAME
diff --git a/readme.txt b/readme.txt
index 16d4d1e..c8a4868 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
-INSTEAD 1.2
-===========
+INSTEAD 1.2.0
+=============
WARNING! For successfull building you must install these development packages (names may vary in your distribution):
diff --git a/setup.iss b/setup.iss
index 2ecef65..7d79039 100644
--- a/setup.iss
+++ b/setup.iss
@@ -1,11 +1,11 @@
[Setup]
AppName=INSTEAD
-AppVerName=INSTEAD 1.2
+AppVerName=INSTEAD 1.2.0
DefaultDirName={pf}\Pinebrush games\INSTEAD
DefaultGroupName=Pinebrush games
UninstallDisplayIcon={app}\sdl-instead.exe
OutputDir=.
-OutputBaseFilename=instead-1.2
+OutputBaseFilename=instead-1.2.0
AllowNoIcons=true
[Languages]
diff --git a/src/sdl-instead/instead.c b/src/sdl-instead/instead.c
index 2daafee..149ee8f 100644
--- a/src/sdl-instead/instead.c
+++ b/src/sdl-instead/instead.c
@@ -349,7 +349,7 @@ static int luaB_is_sound(lua_State *L) {
return 1;
}
-static int luaB_savespath(lua_State *L) {
+static int luaB_get_savepath(lua_State *L) {
lua_pushstring(L, dirname(game_save_path(0, 0)));
return 1;
}
@@ -406,7 +406,7 @@ static const luaL_Reg base_funcs[] = {
{"doencfile", luaB_doencfile},
{"print", luaB_print}, /* for some mystic, it is needed in win version (with -debug) */
{"is_sound", luaB_is_sound},
- {"savespath", luaB_savespath},
+ {"savespath", luaB_get_savepath},
{"set_timer", luaB_set_timer},
{NULL, NULL}
};
diff --git a/src/sdl-instead/unix.c b/src/sdl-instead/unix.c
index 6e752da..791b52f 100644
--- a/src/sdl-instead/unix.c
+++ b/src/sdl-instead/unix.c
@@ -128,7 +128,7 @@ char *open_file_dialog(void)
while ((input(&ev, 0)) == AGAIN);
}
while ((input(&ev, 0)) == AGAIN);
- nsleep(100);
+ nsleep(HZ*100);
}
if (gtk_response == GTK_RESPONSE_ACCEPT) {
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_dialog));
diff --git a/stead/stead.lua b/stead/stead.lua
index bc461d9..8dd96c2 100644
--- a/stead/stead.lua
+++ b/stead/stead.lua
@@ -1,5 +1,5 @@
stead = {
- version = "1.2",
+ version = "1.2.0",
table = table,
string = string,
math = math,