going on 1.1.3

This commit is contained in:
p.kosyh 2010-02-16 08:11:50 +00:00
parent 0afb001140
commit 1949d0616f
11 changed files with 19 additions and 11 deletions

View file

@ -1,4 +1,4 @@
VERSION := 1.1.2 VERSION := 1.1.3
DESTDIR= DESTDIR=
BIN= BIN=

View file

@ -1,4 +1,4 @@
VERSION := 1.1.2 VERSION := 1.1.3
PREFIX=/usr/local PREFIX=/usr/local
DESTDIR= DESTDIR=

View file

@ -1,4 +1,4 @@
VERSION := 1.1.2 VERSION := 1.1.3
PREFIX= PREFIX=
DESTDIR= DESTDIR=

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
instead (1.1.3) unstable; urgency=low
* unix_path in get_img
* " in variable names (save)
-- Peter Kosyh <p.kosyh@gmail.com> Wed, 16 Feb 2010 11:10:40 +0300
instead (1.1.2) unstable; urgency=low instead (1.1.2) unstable; urgency=low
* bug in saves * bug in saves

View file

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Version=1.1.2 Version=1.1.3
Type=Application Type=Application
Name=INSTEAD Name=INSTEAD
Name[ru]=INSTEAD Name[ru]=INSTEAD

View file

@ -13,7 +13,7 @@ body { font-family: Verdana, Arial, Helvetica, sans-serif;
</style> </style>
<title>INSTEAD -- interpreter of simple text adventures for Unix and Windows</title> <title>INSTEAD -- interpreter of simple text adventures for Unix and Windows</title>
</head><body bgcolor="#f0f0f0"> </head><body bgcolor="#f0f0f0">
<h2>INSTEAD 1.1.2</h2> <h2>INSTEAD 1.1.3</h2>
<p>INSTEAD -- interpreter of simple text adventures for Unix and Windows.<br> <p>INSTEAD -- interpreter of simple text adventures for Unix and Windows.<br>
INSTEAD was designed to interpret the games that are the mix of visual novels, text quests and classical 90'ss quests.</p> INSTEAD was designed to interpret the games that are the mix of visual novels, text quests and classical 90'ss quests.</p>

View file

@ -1,4 +1,4 @@
.TH INSTEAD 6 "Version 1.1.2" Instead GAMES .TH INSTEAD 6 "Version 1.1.3" Instead GAMES
.SH NAME .SH NAME

View file

@ -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): WARNING! For successfull building you must install these development packages (names may vary in your distribution):

View file

@ -1,11 +1,11 @@
[Setup] [Setup]
AppName=INSTEAD AppName=INSTEAD
AppVerName=INSTEAD 1.1.2 AppVerName=INSTEAD 1.1.3
DefaultDirName={pf}\Pinebrush games\INSTEAD DefaultDirName={pf}\Pinebrush games\INSTEAD
DefaultGroupName=Pinebrush games DefaultGroupName=Pinebrush games
UninstallDisplayIcon={app}\sdl-instead.exe UninstallDisplayIcon={app}\sdl-instead.exe
OutputDir=. OutputDir=.
OutputBaseFilename=instead-1.1.2 OutputBaseFilename=instead-1.1.3
AllowNoIcons=true AllowNoIcons=true
[Languages] [Languages]

View file

@ -2309,6 +2309,7 @@ img_t get_img(struct layout *layout, char *p)
goto out; goto out;
img = cache_get(layout->img_cache, p); img = cache_get(layout->img_cache, p);
if (!img) { if (!img) {
unix_path(p);
if (!(img = gfx_load_image(p))) if (!(img = gfx_load_image(p)))
return NULL; return NULL;
theme_img_scale(&img); /* bad style, no gfx layer :( */ theme_img_scale(&img); /* bad style, no gfx layer :( */

View file

@ -1,5 +1,5 @@
stead = { stead = {
version = "1.1.2", version = "1.1.3",
table = table, table = table,
string = string, string = string,
math = math, math = math,
@ -1379,7 +1379,7 @@ function savemembers(h, self, name, need)
end end
if type(k) == 'string' then if type(k) == 'string' then
savevar(h, v, name..'["'..k..'"]', need or need2); savevar(h, v, name..'["'..k:gsub('"','\\"')..'"]', need or need2);
else else
savevar(h, v, name.."["..k.."]", need or need2) savevar(h, v, name.."["..k.."]", need or need2)
end end