From 1949d0616fdf43287bffbc542780dc5cf4fc4f07 Mon Sep 17 00:00:00 2001 From: "p.kosyh" Date: Tue, 16 Feb 2010 08:11:50 +0000 Subject: [PATCH] going on 1.1.3 --- Rules.make.standalone | 2 +- Rules.make.system | 2 +- Rules.windows | 2 +- debian/changelog | 7 +++++++ desktop/instead.desktop.in | 2 +- doc/index.html | 2 +- doc/instead.6 | 2 +- readme.txt | 2 +- setup.iss | 4 ++-- src/sdl-instead/graphics.c | 1 + stead/stead.lua | 4 ++-- 11 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Rules.make.standalone b/Rules.make.standalone index b5ad8bb..68183b9 100644 --- a/Rules.make.standalone +++ b/Rules.make.standalone @@ -1,4 +1,4 @@ -VERSION := 1.1.2 +VERSION := 1.1.3 DESTDIR= BIN= diff --git a/Rules.make.system b/Rules.make.system index ca9c8c6..1389651 100644 --- a/Rules.make.system +++ b/Rules.make.system @@ -1,4 +1,4 @@ -VERSION := 1.1.2 +VERSION := 1.1.3 PREFIX=/usr/local DESTDIR= diff --git a/Rules.windows b/Rules.windows index fe7dfd8..d01e362 100644 --- a/Rules.windows +++ b/Rules.windows @@ -1,4 +1,4 @@ -VERSION := 1.1.2 +VERSION := 1.1.3 PREFIX= DESTDIR= diff --git a/debian/changelog b/debian/changelog index aadcc7c..43fd69b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +instead (1.1.3) unstable; urgency=low + + * unix_path in get_img + * " in variable names (save) + + -- Peter Kosyh Wed, 16 Feb 2010 11:10:40 +0300 + instead (1.1.2) unstable; urgency=low * bug in saves diff --git a/desktop/instead.desktop.in b/desktop/instead.desktop.in index f7f4328..a386f0d 100644 --- a/desktop/instead.desktop.in +++ b/desktop/instead.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=1.1.2 +Version=1.1.3 Type=Application Name=INSTEAD Name[ru]=INSTEAD diff --git a/doc/index.html b/doc/index.html index dc0d331..8b33dd7 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.1.2

+

INSTEAD 1.1.3

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 357e8e9..af83ab2 100644 --- a/doc/instead.6 +++ b/doc/instead.6 @@ -1,4 +1,4 @@ -.TH INSTEAD 6 "Version 1.1.2" Instead GAMES +.TH INSTEAD 6 "Version 1.1.3" Instead GAMES .SH NAME diff --git a/readme.txt b/readme.txt index 8db9fe3..17c1b46 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -INSTEAD 1.1.2 +INSTEAD 1.1.3 ============= 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 fa4f8ea..ca70af5 100644 --- a/setup.iss +++ b/setup.iss @@ -1,11 +1,11 @@ [Setup] AppName=INSTEAD -AppVerName=INSTEAD 1.1.2 +AppVerName=INSTEAD 1.1.3 DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultGroupName=Pinebrush games UninstallDisplayIcon={app}\sdl-instead.exe OutputDir=. -OutputBaseFilename=instead-1.1.2 +OutputBaseFilename=instead-1.1.3 AllowNoIcons=true [Languages] diff --git a/src/sdl-instead/graphics.c b/src/sdl-instead/graphics.c index c1abe9c..3e69a5b 100644 --- a/src/sdl-instead/graphics.c +++ b/src/sdl-instead/graphics.c @@ -2309,6 +2309,7 @@ img_t get_img(struct layout *layout, char *p) goto out; img = cache_get(layout->img_cache, p); if (!img) { + unix_path(p); if (!(img = gfx_load_image(p))) return NULL; theme_img_scale(&img); /* bad style, no gfx layer :( */ diff --git a/stead/stead.lua b/stead/stead.lua index 6904544..d1019b0 100644 --- a/stead/stead.lua +++ b/stead/stead.lua @@ -1,5 +1,5 @@ stead = { - version = "1.1.2", + version = "1.1.3", table = table, string = string, math = math, @@ -1379,7 +1379,7 @@ function savemembers(h, self, name, need) end if type(k) == 'string' then - savevar(h, v, name..'["'..k..'"]', need or need2); + savevar(h, v, name..'["'..k:gsub('"','\\"')..'"]', need or need2); else savevar(h, v, name.."["..k.."]", need or need2) end