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

1.4.5 go on

Browse source
This commit is contained in:
p.kosyh 2011-07-17 11:13:28 +00:00
parent c82a738ed8
commit 55ee03a8f9
18 changed files with 35 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.mingw32ce
View file

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

2
PKGBUILD.in
View file

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

2
Rules.make.macosx
View file

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

2
Rules.make.standalone
View file

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

2
Rules.make.system
View file

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

2
Rules.mingw
View file

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

2
Rules.windows
View file

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

2
doc/index.html
View file

@ -13,7 +13,7 @@ body { font-family: Verdana, Arial, Helvetica, sans-serif;
</style>
<title>INSTEAD -- interpreter of simple text adventures for Unix and Windows</title>
</head><body bgcolor="#f0f0f0">
<h2>INSTEAD 1.4.4</h2>
<h2>INSTEAD 1.4.5</h2>
<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>

2
doc/instead.6
View file

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

2
instead.pkg
View file

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

2
instead.spec
View file

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

2
readme.txt
View file

@ -1,4 +1,4 @@
INSTEAD 1.4.4
INSTEAD 1.4.5
=============
WARNING! For successfull building you must install these development packages (names may vary in your distribution):

4
setup-kit.iss
View file

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

4
setup.iss
View file

@ -1,11 +1,11 @@
[Setup]
AppName=INSTEAD
AppVerName=INSTEAD 1.4.4
AppVerName=INSTEAD 1.4.5
DefaultDirName={pf}\Pinebrush games\INSTEAD
DefaultGroupName=Pinebrush games
UninstallDisplayIcon={app}\sdl-instead.exe
OutputDir=.
OutputBaseFilename=instead-1.4.4
OutputBaseFilename=instead-1.4.5
AllowNoIcons=true
SetupIconFile=icon\sdl_instead.ico
ChangesAssociations=yes

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

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

6
stead/goto.lua
View file

@ -196,15 +196,15 @@ end
stead.go = stead.hook(stead.go, function(f, ...)
local r,v = f(...)
if type(r) == 'string' and stead.get_cctx() then
if type(r) == 'string' and stead.cctx() then
pr (r)
end
if stead.in_life_call then
ACTION_TEXT = nil
end
if r == nil and v == nil then
if stead.get_cctx() then
stead.get_cctx().action = true
if stead.cctx() then
stead.cctx().action = true
else
r = true
end

2
stead/snapshots.lua
View file

@ -39,7 +39,7 @@ stead.restore_snapshot = function (nr)
i = do_ini(game, true);
RAW_TEXT = true
-- delete_snapshot(nr);
if stead.get_cctx() then
if stead.cctx() then
pr(i)
end
return i;

30
stead/stead.lua
View file

@ -1,5 +1,5 @@
stead = {
version = "1.4.4",
version = "1.4.5",
api_version = "1.1.6", -- last version before 1.2.0
table = table,
delim = ',',
@ -13,7 +13,7 @@ stead = {
os = os,
readdir = readdir,
call_top = 0,
cctx = { txt = nil, self = nil },
call_ctx = { txt = nil, self = nil },
-- functions = {}, -- code blocks
timer = function()
if type(timer) == 'table' and type(timer.callback) == 'function' then
@ -94,15 +94,13 @@ stead.tostring = function(v)
return v
end
function cctx()
return stead.cctx[stead.call_top];
stead.cctx = function()
return stead.call_ctx[stead.call_top];
end
stead.get_cctx = cctx
function callpush(v, ...)
stead.call_top = stead.call_top + 1;
stead.cctx[stead.call_top] = { txt = nil, self = v, action = false };
stead.call_ctx[stead.call_top] = { txt = nil, self = v, action = false };
args = {...};
arg1 = args[1]
arg2 = args[2]
@ -135,7 +133,7 @@ end
stead.clearargs = clearargs
function callpop()
stead.cctx[stead.call_top] = nil;
stead.call_ctx[stead.call_top] = nil;
stead.call_top = stead.call_top - 1;
if stead.call_top < 0 then
error ("callpush/callpop mismatch")
@ -145,34 +143,34 @@ end
stead.callpop = callpop
function pclr()
stead.get_cctx().txt = nil
stead.cctx().txt = nil
end
stead.pclr = pclr
function pget()
return stead.get_cctx().txt;
return stead.cctx().txt;
end
stead.pget = pget
function p(...)
local i
local a = {...}
for i = 1, stead.table.maxn(a) do
stead.get_cctx().txt = stead.par('', stead.get_cctx().txt, tostring(a[i]));
stead.cctx().txt = stead.par('', stead.cctx().txt, tostring(a[i]));
end
stead.get_cctx().txt = stead.cat(stead.get_cctx().txt, ' ');
stead.cctx().txt = stead.cat(stead.cctx().txt, ' ');
end
stead.p = p
function pr(...)
local i
local a = {...}
for i = 1, stead.table.maxn(a) do
stead.get_cctx().txt = stead.par('', stead.get_cctx().txt, tostring(a[i]));
stead.cctx().txt = stead.par('', stead.cctx().txt, tostring(a[i]));
end
end
stead.pr = pr
function pn(...)
p(...);
stead.get_cctx().txt = stead.par('', stead.get_cctx().txt,'^');
stead.cctx().txt = stead.par('', stead.cctx().txt,'^');
end
stead.pn = pn
-- merge strings with "space" as separator
@ -822,7 +820,7 @@ function call(v, n, ...)
if type(a) == 'boolean' and b == nil then
b, a = a, stead.pget()
if a == nil then
if stead.get_cctx().action then
if stead.cctx().action then
a = true
else
a = b
@ -833,7 +831,7 @@ function call(v, n, ...)
a = stead.pget()
b = nil
end
if a == nil and b == nil and stead.get_cctx().action then
if a == nil and b == nil and stead.cctx().action then
a = true
end
stead.callpop()