oreolek/steed
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix in lifes output, fix in gamefile goto(here, unused parameters, 1.4.6

Browse source
This commit is contained in:
p.kosyh 2011-08-09 06:33:21 +00:00
parent 3b86cde4d0
commit ddcb9b52b9
19 changed files with 38 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKGBUILD.in
View file

@ -1,6 +1,6 @@
# Contributor: Peter Kosyh <p.kosyhgmail.com> # Contributor: Peter Kosyh <p.kosyhgmail.com>
pkgname=instead pkgname=instead
pkgver=1.4.5 pkgver=1.4.6
pkgrel=1 pkgrel=1
pkgdesc="instead quest interpreter" pkgdesc="instead quest interpreter"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')

2
README
View file

@ -1,4 +1,4 @@
INSTEAD 1.4.5 INSTEAD 1.4.6
============= =============
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):

2
Rules.make.macosx
View file

@ -1,4 +1,4 @@
VERSION := 1.4.5 VERSION := 1.4.6
DESTDIR= DESTDIR=
BIN= BIN=

2
Rules.make.mingw32ce
View file

@ -1,4 +1,4 @@
VERSION := 1.4.5 VERSION := 1.4.6
PREFIX= PREFIX=
DESTDIR= DESTDIR=

2
Rules.make.standalone
View file

@ -1,4 +1,4 @@
VERSION := 1.4.5 VERSION := 1.4.6
DESTDIR= DESTDIR=
BIN= BIN=

2
Rules.make.system
View file

@ -1,4 +1,4 @@
VERSION := 1.4.5 VERSION := 1.4.6
PREFIX=/usr/local PREFIX=/usr/local
DESTDIR= DESTDIR=

2
Rules.mingw
View file

@ -1,4 +1,4 @@
VERSION := 1.4.5 VERSION := 1.4.6
PREFIX=./ PREFIX=./
DESTDIR= DESTDIR=

2
Rules.windows
View file

@ -1,4 +1,4 @@
VERSION := 1.4.5 VERSION := 1.4.6
PREFIX= PREFIX=
DESTDIR= DESTDIR=

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
instead (1.4.6) unstable; urgency=low
* bug fix in gamefile;
* bug fix in lifes output;
-- Peter Kosyh <p.kosyh@gmail.com> Mon, 09 Aug 2011 12:24:00 +0400
instead (1.4.5) unstable; urgency=low instead (1.4.5) unstable; urgency=low
* bug fix in rnd() w/o parameter; * bug fix in rnd() w/o parameter;

2
desktop/instead.desktop.in
View file

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

2
doc/index.html
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.4.5</h2> <h2>INSTEAD 1.4.6</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>

2
doc/instead.6
View file

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

2
instead.pkg
View file

@ -8,7 +8,7 @@
&EN &EN
; standard SIS file header ; standard SIS file header
#{"INSTEAD"},(0xA0020410),1,4,5 #{"INSTEAD"},(0xA0020410),1,4,6
;Localised Vendor name ;Localised Vendor name
%{"Peter Kosyh"} %{"Peter Kosyh"}

2
instead.spec
View file

@ -1,6 +1,6 @@
Summary: simply text adventures/visual novels engine and game Summary: simply text adventures/visual novels engine and game
Name: instead Name: instead
Version: 1.4.5 Version: 1.4.6
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
URL: http://instead.googlecode.com URL: http://instead.googlecode.com

4
setup-kit.iss
View file

@ -1,11 +1,11 @@
[Setup] [Setup]
AppName=INSTEAD-KIT AppName=INSTEAD-KIT
AppVerName=INSTEAD 1.4.5 AppVerName=INSTEAD 1.4.6
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-kit-1.4.5 OutputBaseFilename=instead-kit-1.4.6
AllowNoIcons=true AllowNoIcons=true
[Languages] [Languages]

4
setup.iss
View file

@ -1,11 +1,11 @@
[Setup] [Setup]
AppName=INSTEAD AppName=INSTEAD
AppVerName=INSTEAD 1.4.5 AppVerName=INSTEAD 1.4.6
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.4.5 OutputBaseFilename=instead-1.4.6
AllowNoIcons=true AllowNoIcons=true
SetupIconFile=icon\sdl_instead.ico SetupIconFile=icon\sdl_instead.ico
ChangesAssociations=yes ChangesAssociations=yes

14
src/sdl-instead/SDL_rotozoom.c
View file

@ -91,7 +91,7 @@ Assumes dst surface was allocated with the correct dimensions.
*/ */
int _shrinkSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int factorx, int factory) int _shrinkSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int factorx, int factory)
{ {
int x, y, dx, dy, sgap, dgap, ra, ga, ba, aa; int x, y, dx, dy, dgap, ra, ga, ba, aa;
int n_average; int n_average;
tColorRGBA *sp, *osp, *oosp; tColorRGBA *sp, *osp, *oosp;
tColorRGBA *dp; tColorRGBA *dp;
@ -107,7 +107,7 @@ int _shrinkSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int factorx, int fa
* Scan destination * Scan destination
*/ */
sp = (tColorRGBA *) src->pixels; sp = (tColorRGBA *) src->pixels;
sgap = src->pitch - src->w * 4; // sgap = src->pitch - src->w * 4;
dp = (tColorRGBA *) dst->pixels; dp = (tColorRGBA *) dst->pixels;
dgap = dst->pitch - dst->w * 4; dgap = dst->pitch - dst->w * 4;
@ -180,7 +180,7 @@ Assumes dst surface was allocated with the correct dimensions.
*/ */
int _shrinkSurfaceY(SDL_Surface * src, SDL_Surface * dst, int factorx, int factory) int _shrinkSurfaceY(SDL_Surface * src, SDL_Surface * dst, int factorx, int factory)
{ {
int x, y, dx, dy, sgap, dgap, a; int x, y, dx, dy, dgap, a;
int n_average; int n_average;
Uint8 *sp, *osp, *oosp; Uint8 *sp, *osp, *oosp;
Uint8 *dp; Uint8 *dp;
@ -196,7 +196,7 @@ int _shrinkSurfaceY(SDL_Surface * src, SDL_Surface * dst, int factorx, int facto
* Scan destination * Scan destination
*/ */
sp = (Uint8 *) src->pixels; sp = (Uint8 *) src->pixels;
sgap = src->pitch - src->w; // sgap = src->pitch - src->w;
dp = (Uint8 *) dst->pixels; dp = (Uint8 *) dst->pixels;
dgap = dst->pitch - dst->w; dgap = dst->pitch - dst->w;
@ -729,7 +729,7 @@ Assumes dst surface was allocated with the correct dimensions.
*/ */
void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy) void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy)
{ {
int x, y, dx, dy, xd, yd, sdx, sdy, ax, ay, sw, sh; int x, y, dx, dy, xd, yd, sdx, sdy, ax, ay;
tColorY *pc, *sp; tColorY *pc, *sp;
int gap; int gap;
@ -740,8 +740,8 @@ void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int
yd = ((src->h - dst->h) << 15); yd = ((src->h - dst->h) << 15);
ax = (cx << 16) - (icos * cx); ax = (cx << 16) - (icos * cx);
ay = (cy << 16) - (isin * cx); ay = (cy << 16) - (isin * cx);
sw = src->w - 1; // sw = src->w - 1;
sh = src->h - 1; // sh = src->h - 1;
pc = (tColorY*) dst->pixels; pc = (tColorY*) dst->pixels;
gap = dst->pitch - dst->w; gap = dst->pitch - dst->w;
/* /*

2
src/sdl-instead/s60.h
View file

@ -1,7 +1,7 @@
#ifndef S60_H #ifndef S60_H
#define S60_H #define S60_H
#define PATH_MAX 256 #define PATH_MAX 256
#define VERSION "1.4.5" #define VERSION "1.4.6"
#define DATAPATH "./" #define DATAPATH "./"
#define STEAD_PATH DATAPATH"stead/" #define STEAD_PATH DATAPATH"stead/"
#define THEMES_PATH DATAPATH"themes/" #define THEMES_PATH DATAPATH"themes/"

8
stead/stead.lua
View file

@ -1,5 +1,5 @@
stead = { stead = {
version = "1.4.5", version = "1.4.6",
api_version = "1.1.6", -- last version before 1.2.0 api_version = "1.1.6", -- last version before 1.2.0
table = table, table = table,
delim = ',', delim = ',',
@ -1477,6 +1477,10 @@ function game_life(self)
if not isDisabled(o) then if not isDisabled(o) then
PLAYER_MOVED = false PLAYER_MOVED = false
vv,pre = stead.call(o, 'life'); vv,pre = stead.call(o, 'life');
if PLAYER_MOVED then -- clear life output, but not current
av = nil
v = nil
end
if pre or (PLAYER_MOVED and pre ~= false) then if pre or (PLAYER_MOVED and pre ~= false) then
av = stead.par(' ', av, vv); av = stead.par(' ', av, vv);
else else
@ -1854,7 +1858,7 @@ function gamefile(file, forget)
if forget then if forget then
game:start() game:start()
stead.started = true stead.started = true
return goto(here()); return stead.goto(here(), false, false, true);
end end
end end