[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 ba734bb 232/237: Fixed some
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 ba734bb 232/237: Fixed some in game problems |
Date: |
Mon, 25 Jul 2016 18:15:15 +0000 (UTC) |
tag: Release_0-3-1
commit ba734bb74888a70f976bbf1d03feee20f933fb0b
Author: adondev <adondev>
Commit: adondev <adondev>
Fixed some in game problems
Added debian packages building ability
---
INSTALL | 11 ++++++
Makefile.am | 10 ++++--
configure.in | 38 +++++++++++++++-----
debian/README.debian | 6 ++++
debian/adonthell-wastesedge.6 | 16 +++++++++
debian/changelog | 13 +++++++
debian/control | 17 +++++++++
debian/copyright | 21 +++++++++++
debian/dirs | 1 +
debian/menu | 3 ++
debian/rules | 52 ++++++++++++++++++++++++++++
gfx/cutscene/extro_chest.img | Bin 73208 -> 73208 bytes
scripts/init.py | 2 +-
scripts/schedules/mapcharacters/fellnir.py | 5 ++-
14 files changed, 179 insertions(+), 16 deletions(-)
diff --git a/INSTALL b/INSTALL
index 4b8b303..1a04c00 100755
--- a/INSTALL
+++ b/INSTALL
@@ -12,6 +12,9 @@ This should print '0.3' and exit.
Installing:
===========
+From source:
+------------
+
In the toplevel wastesedge-0.3 directory type
$> ./configure
@@ -23,6 +26,14 @@ $> make install
For more information, see the README file.
+Debian users:
+-------------
+
+You can automatically get an installable Debian package by typing
+'debuild', which comes in the 'devscripts' package. You'll of course
+need a properly installed 'adonthell' package, which you can get from
+Adonthell's sources.
+
You can then check whether the game is correctly installed by invoking
'adonthell -l', which should list 'wastesedge'.
diff --git a/Makefile.am b/Makefile.am
index b9daedb..90203ce 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,17 +2,21 @@ SUBDIRS = . audio gfx maps scripts
pkgdatadir = $(gamedatadir)
-pkgdata_DATA = gamename.txt character.data mapengine.data quest.data
audio.data PLAYING
+pkgdata_DATA = gamename.txt character.data mapengine.data quest.data audio.data
-EXTRA_DIST = $(pkgdata_DATA)
+EXTRA_DIST = $(pkgdata_DATA) PLAYING autogen.sh \
+ debian/README.debian debian/adonthell-wastesedge.6 debian/changelog
debian/control \
+ debian/copyright debian/dirs debian/rules debian/menu
bin_SCRIPTS = adonthell-wastesedge
+CLEANFILES = $(bin_SCRIPTS)
+
# -- clean game directory before installing
install-exec-local:
rm -Rf $(gamedatadir)
-adonthell-wastesedge:
+adonthell-wastesedge: Makefile
echo -e "#!/bin/sh\n\n$(adonthell_binary) wastesedge" >
adonthell-wastesedge
# -- make sure the data directory gets deleted
diff --git a/configure.in b/configure.in
index f1c89a9..9529e26 100755
--- a/configure.in
+++ b/configure.in
@@ -4,22 +4,42 @@ dnl
**************************************************************
AC_INIT(README)
-AM_INIT_AUTOMAKE(wastesedge, 0.3)
+AM_INIT_AUTOMAKE(wastesedge, 0.3.1)
+
+dnl ********************
+dnl Additional arguments
+dnl ********************
+
+AC_ARG_WITH(data-dir,
+[ --with-data-dir=DIR Directory where datas will be installed],
+ adonthelldatadir="$withval", adonthelldatadir=none)
+
+AC_ARG_WITH(adonthell-binary,
+[ --with-adonthell-binary=FILE The Adonthell engine binary],
+ adonthell_binary="$withval", adonthell_binary=none)
dnl Checking for Adonthell
-AC_PATH_PROG(adonthell_binary, adonthell)
-if test x$adonthell_binary == x ; then
- echo "Waste's Edge requires the Adonthell game engine. Exiting..."
- exit 1
+if test x$adonthelldatadir = xnone; then
+ AC_PATH_PROG(adonthell_binary, adonthell)
+ if test x$adonthell_binary == x ; then
+ echo "Waste's Edge requires the Adonthell game engine. Exiting..."
+ exit 1
+ fi
+else
+ echo "Using $adonthell_binary as the Adonthell binary"
fi
dnl Checking for the Adonthell data directory
-AC_MSG_CHECKING(for Adonthell data directory)
-adonthelldatadir=`$adonthell_binary -d`
-AC_MSG_RESULT($adonthelldatadir)
+if test x$adonthelldatadir = xnone; then
+ AC_MSG_CHECKING(for Adonthell data directory)
+ adonthelldatadir=`$adonthell_binary -d`
+ AC_MSG_RESULT($adonthelldatadir)
+else
+ echo "Destination directory: $adonthelldatadir"
+fi
dnl Sets where the game will install itself
-gamedatadir=${adonthelldatadir}/games/wastesedge
+gamedatadir="${adonthelldatadir}/games/wastesedge"
AC_SUBST(gamedatadir)
AC_SUBST(adonthell_binary)
diff --git a/debian/README.debian b/debian/README.debian
new file mode 100644
index 0000000..37e2430
--- /dev/null
+++ b/debian/README.debian
@@ -0,0 +1,6 @@
+wastesedge for Debian
+----------------------
+
+Comments regarding the Package
+
+Alexandre Courbot <address@hidden>, Sat, 2 Feb 2002 17:59:49 +0100
diff --git a/debian/adonthell-wastesedge.6 b/debian/adonthell-wastesedge.6
new file mode 100644
index 0000000..c991f9d
--- /dev/null
+++ b/debian/adonthell-wastesedge.6
@@ -0,0 +1,16 @@
+.TH NAME SECTION
+.SH NAME
+adonthell-wastesedge \- Waste's Edge game for the Adonthell engine.
+.SH SYNOPSIS
+.B adonthell-wastesedge
+.SH "DESCRIPTION"
+As a loyal servant of the elven Lady Silverhair, you arrive at the remote
+trading post of Waste's Edge, where she is engaged in negotiations with the
+dwarish merchant Bjarn Fingolson. But not all is well at Waste's Edge, and
+soon you are confronted with circumstances that are about to destroy your
+mistress' high reputation. And you are the only one to avert this ...
+.SH "SEE ALSO"
+adonthell (6)
+.SH AUTHOR
+This manual page was written by Alexandre Courbot <address@hidden>,
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..fe2f525
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,13 @@
+wastesedge (0.3.1-1) unstable; urgency=low
+
+ * Using code base 0.3.1.
+
+ -- Alexandre Courbot <address@hidden> Tue, 5 Feb 2002 13:33:47 +0100
+
+wastesedge (0.3-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Alexandre Courbot <address@hidden> Sat, 2 Feb 2002 17:59:49 +0100
+
+
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..d66630e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,17 @@
+Source: wastesedge
+Section: games
+Priority: extra
+Maintainer: Alexandre Courbot <address@hidden>
+Standards-Version: 3.2.1
+
+Package: wastesedge
+Architecture: any
+Depends: adonthell (>= 0.3), adonthell(<< 0.4)
+Description: Official game for Adonthell 0.3
+ Official game for Adonthell 0.3
+ .
+ As a loyal servant of the elven Lady Silverhair, you arrive at the remote
+ trading post of Waste's Edge, where she is engaged in negotiations with the
+ dwarish merchant Bjarn Fingolson. But not all is well at Waste's Edge, and
+ soon you are confronted with circumstances that are about to destroy your
+ mistress' high reputation. And you are the only one to avert this ...
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..e88a24a
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,21 @@
+This package was debianized by Alexandre Courbot address@hidden on
+Sat, 2 Feb 2002 17:59:49 +0100.
+
+It was downloaded from http://adonthell.linuxgames.com/download/
+
+Copyright: (c) 2000/2001 Kai Sterker & the Adonthell team.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Debian system; see the file /usr/doc/copyright/GPL. If not,
+write to the Free Software Foundation, Inc., 59 Temple Place - Suite
+330, Boston, MA 02111-1307, USA.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e777271
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/share/adonthell/games/wastesedge
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000..6bdcc13
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,3 @@
+?package(wastesedge):needs=X11 section=Games/Adventure \
+ title="Adonthell - Waste's Edge" \
+ command="/usr/games/adonthell-wastesedge"
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..706c9f1
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,52 @@
+#!/usr/bin/make -f
+# Made with the aid of debmake, by Christoph Lameter,
+# based on the sample debian/rules file for GNU hello by Ian Jackson.
+
+package=wastesedge
+
+build:
+ $(checkdir)
+ ./configure --prefix=/usr --with-data-dir='$${datadir}/adonthell' \
+ --with-adonthell-binary=/usr/games/adonthell \
+ --bindir='$${prefix}/games'
+ $(MAKE) CFLAGS="-O2 -g -Wall"
+ touch build
+
+clean:
+ $(checkdir)
+ -rm -f build
+ -$(MAKE) distclean
+ -rm -f `find . -name "*~"`
+ -rm -rf debian/tmp debian/files* core debian/substvars
+
+binary-indep: checkroot build
+ $(checkdir)
+# There are no architecture-independent files to be uploaded
+# generated by this package. If there were any they would be
+# made here.
+
+binary-arch: checkroot build
+ $(checkdir)
+ -rm -rf debian/tmp
+ install -d debian/tmp
+ cd debian/tmp && install -d `cat ../dirs`
+ $(MAKE) install prefix=`pwd`/debian/tmp/usr
+# Must have debmake installed for this to work. Otherwise please copy
+# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
+ debstd ChangeLog NEWS README
+ dpkg-gencontrol -isp
+ chown -R root.root debian/tmp
+ chmod -R go=rX debian/tmp
+ dpkg --build debian/tmp ..
+
+define checkdir
+ test -f debian/rules
+endef
+
+binary: binary-indep binary-arch
+
+checkroot:
+ $(checkdir)
+ test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot
diff --git a/gfx/cutscene/extro_chest.img b/gfx/cutscene/extro_chest.img
index 9c0716c..a2e4846 100644
Binary files a/gfx/cutscene/extro_chest.img and b/gfx/cutscene/extro_chest.img
differ
diff --git a/scripts/init.py b/scripts/init.py
index 3bbef63..8020166 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -179,7 +179,7 @@ class title_screen:
# -- load the initial game
gamedata_load (0)
adonthell.gamedata_player ().set_name (cs.name)
-
+
# -- on to the intro
self.play_intro ()
diff --git a/scripts/schedules/mapcharacters/fellnir.py
b/scripts/schedules/mapcharacters/fellnir.py
index a8c10b4..4395dbd 100644
--- a/scripts/schedules/mapcharacters/fellnir.py
+++ b/scripts/schedules/mapcharacters/fellnir.py
@@ -22,8 +22,7 @@ class fellnir:
def __init__ (self, mapcharacterinstance):
self.myself = mapcharacterinstance
self.speech = ["Master Orloth should throw out that brute!", \
- "Take equal parts of vitriol, nitre and sal ammoniac
...", \
- "I have to talk with %s." % gamedata_player().get_name
()]
+ "Take equal parts of vitriol, nitre and sal ammoniac
..."]
self.coords = [(2, 5, STAND_EAST), \
(4, 4, STAND_SOUTH), \
@@ -65,6 +64,6 @@ class fellnir:
tmp = myself.get_val ("say_something")
myself.set_val ("say_something", tmp - 1)
if tmp <= 0:
- myself.speak (self.speech[randint (0, 2)])
+ myself.speak (self.speech[randint (0, 1)])
delay = randint (20, 40) * 40
myself.set_val ("say_something", delay)
- [adonthell-wastesedge-commits] Release_0-3-1 95f5a33 223/237: FIXED some typos, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 95f5a33 223/237: FIXED some typos, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4d12cf8 222/237: FIXED error message at startup, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 397f0ce 209/237: Tuned the extro a bit, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3727a0b 224/237: ADDED final versions of the demo songs, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7a54bfe 200/237: RESTRUCTURED Jelom a little, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 049cceb 174/237: ADDED gem found in Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 01380a3 221/237: Tuned intro & extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0a4e9eb 236/237: REMOVED ^M's from end of line, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fa549f8 159/237: FIXED bug in Erek's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d412018 189/237: ADDED .cvsignore, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ba734bb 232/237: Fixed some in game problems,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 30df91a 158/237: FINISHED Tristan, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e22605d 178/237: Added various stuff on the map, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 140e4c2 172/237: Deactivated the 'Options' option, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4defa7b 194/237: FIXED bug, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d190e60 164/237: FIXED the mess I made with my last update :(, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 25cd3d4 153/237: Improved Eyes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bb956f2 196/237: ADDED shutdown, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a4da9a 234/237: ADDED ability to build RPM package, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7e2a6c6 157/237: FIXED some bugs, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bc3ef93 217/237: ADDED PLAYING file, Kai Sterker, 2016/07/25