[SCM] Trophy racing game - Packaging information branch, master, updated. debian/2.0.0-1-7-g3fb7971
Andreas Moog
amoog at ubuntu.com
Sat Mar 3 17:40:00 UTC 2012
The following commit has been merged in the master branch:
commit a90eb1cb606c58c06ef69b9f3b83b5c0d3747dee
Author: Andreas Moog <amoog at ubuntu.com>
Date: Sat Mar 3 17:45:33 2012 +0100
Imported Upstream version 2.0.2
diff --git a/AUTHORS b/AUTHORS
index fd9c749..417e05d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,5 @@
-Project coordination, main developer:
+Developers:
Andrew Mustun <andrew at mustun.com>
-
-Developers:
Matthieu Lecesne <matthieulecesne at yahoo.fr>
Colin Pitrat <colin.pitrat at gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 60f79d8..9a899c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2.0.2 Add man page
+
+2.0.1 Small fixes for debian packaging
+
2.0.0 Add championship, shop, key configuration, load/save features and lot of code refactoring
1.1.5 Bugs fixes and code cleanup
diff --git a/Makefile.am b/Makefile.am
index add8ef1..a2cec7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
SUBDIRS = resources src
-EXTRA_DIST = doxy.cfg
+EXTRA_DIST = \
+ doxy.cfg \
+ README.install
diff --git a/Makefile.in b/Makefile.in
index d25cb55..b8c4e71 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -189,7 +189,10 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = resources src
-EXTRA_DIST = doxy.cfg
+EXTRA_DIST = \
+ doxy.cfg \
+ README.install
+
all: all-recursive
.SUFFIXES:
diff --git a/README b/README
index 27b16b6..13ed863 100644
--- a/README
+++ b/README
@@ -6,34 +6,18 @@
Programming, Graphics and Sounds by
Andrew Mustun
+ Matthieu Lecesne
+ Colin Pitrat
andrew at mustun.com
+ matthieulecesne at yahoo.fr
+ colin.pitrat at gmail.com
- 08/2000
TROPHY is a car racing game with some special features
like shooting and dropping bombs.
-Requirements
-------------
-
-TROPHY requires ClanLib 0.8 or 1.0 to run.
-
-You can get ClanLib from www.clanlib.org
-
-Hardware:
-You need a lot of video memory to run TROPHY. However,
-it should run anyway but the quality might suffer if
-your hardware isn't good enough.
-
-
-Installation
-------------
-
-To install TROPHY simply extract it to any directory you
-prefer.
-
Use
---
@@ -60,8 +44,6 @@ of 800x600 and without sound.
The control keys are:
Arrow keys for steering, gas and break
-E Gas
-D Break
A Turbo
X Shoot
C Drop bombs
diff --git a/README.install b/README.install
new file mode 100644
index 0000000..04b8af1
--- /dev/null
+++ b/README.install
@@ -0,0 +1,43 @@
+
+ TROPHY
+
+ http://trophy.sourceforge.net
+
+ Programming, Graphics and Sounds by
+
+ Andrew Mustun
+ Matthieu Lecesne
+ Colin Pitrat
+
+ andrew at mustun.com
+ matthieulecesne at yahoo.fr
+ colin.pitrat at gmail.com
+
+
+
+TROPHY is a car racing game with some special features
+like shooting and dropping bombs.
+
+Requirements
+------------
+
+TROPHY requires ClanLib 0.8 or 1.0 to run.
+
+You can get ClanLib from www.clanlib.org
+
+Hardware:
+You need a lot of video memory to run TROPHY. However,
+it should run anyway but the quality might suffer if
+your hardware isn't good enough.
+
+
+Installation
+------------
+
+To install TROPHY simply extract it to any directory you
+prefer.
+On Unix-like systems just run those commands:
+./configure
+make
+make install
+
diff --git a/configure b/configure
index a3739b9..3f0dda1 100755
--- a/configure
+++ b/configure
@@ -2310,7 +2310,7 @@ fi
# Define the identity of the package.
PACKAGE=trophy
- VERSION=2.0.0
+ VERSION=2.0.2
cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 795cc52..9c24dcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/catrophy.cpp)
-AM_INIT_AUTOMAKE(trophy,2.0.0)
+AM_INIT_AUTOMAKE(trophy,2.0.2)
diff --git a/doxy.cfg b/doxy.cfg
index ddeeac3..4089908 100644
--- a/doxy.cfg
+++ b/doxy.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME = Trophy
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 2.0.0
+PROJECT_NUMBER = 2.0.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/resources/Makefile.am b/resources/Makefile.am
index d366aa3..224e862 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -1,3 +1,5 @@
+dist_man_MANS = trophy.6
+
pkgdata_DATA = resources.xml
desktopdir = $(datadir)/applications
diff --git a/resources/Makefile.in b/resources/Makefile.in
index 26db319..4390137 100644
--- a/resources/Makefile.in
+++ b/resources/Makefile.in
@@ -33,7 +33,8 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = resources
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -64,7 +65,8 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(Downtowndir)" \
+man6dir = $(mandir)/man6
+am__installdirs = "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(Downtowndir)" \
"$(DESTDIR)$(Industrialdir)" "$(DESTDIR)$(Loopsdir)" \
"$(DESTDIR)$(Moondir)" "$(DESTDIR)$(Rallydir)" \
"$(DESTDIR)$(Snakedir)" "$(DESTDIR)$(Zigzagdir)" \
@@ -78,6 +80,8 @@ am__installdirs = "$(DESTDIR)$(Downtowndir)" \
"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(soundsdir)" \
"$(DESTDIR)$(tiresdir)" "$(DESTDIR)$(vwdir)" \
"$(DESTDIR)$(z3dir)"
+NROFF = nroff
+MANS = $(dist_man_MANS)
DATA = $(Downtown_DATA) $(Industrial_DATA) $(Loops_DATA) $(Moon_DATA) \
$(Rally_DATA) $(Snake_DATA) $(Zigzag_DATA) $(Zurich_DATA) \
$(armors_DATA) $(cars_DATA) $(desktop_DATA) $(flash2_DATA) \
@@ -177,6 +181,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+dist_man_MANS = trophy.6
pkgdata_DATA = resources.xml
desktopdir = $(datadir)/applications
desktop_DATA = trophy.desktop
@@ -277,6 +282,44 @@ $(top_srcdir)/configure: $(am__configure_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+install-man6: $(dist_man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man6dir)" || $(MKDIR_P) "$(DESTDIR)$(man6dir)"
+ @list=''; test -n "$(man6dir)" || exit 0; \
+ { for i in $$list; do echo "$$i"; done; \
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.6[a-z]*$$/p'; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^6][0-9a-z]*$$,6,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man6dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man6dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man6dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man6dir)" || exit $$?; }; \
+ done; }
+
+uninstall-man6:
+ @$(NORMAL_UNINSTALL)
+ @list=''; test -n "$(man6dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.6[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^6][0-9a-z]*$$,6,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ test -z "$$files" || { \
+ echo " ( cd '$(DESTDIR)$(man6dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(man6dir)" && rm -f $$files; }
install-DowntownDATA: $(Downtown_DATA)
@$(NORMAL_INSTALL)
test -z "$(Downtowndir)" || $(MKDIR_P) "$(DESTDIR)$(Downtowndir)"
@@ -805,6 +848,19 @@ CTAGS:
distdir: $(DISTFILES)
+ @list='$(MANS)'; if test -n "$$list"; then \
+ list=`for p in $$list; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+ if test -n "$$list" && \
+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+ echo " typically \`make maintainer-clean' will remove them" >&2; \
+ exit 1; \
+ else :; fi; \
+ else :; fi
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -836,9 +892,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(DATA)
+all-am: Makefile $(MANS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(Downtowndir)" "$(DESTDIR)$(Industrialdir)" "$(DESTDIR)$(Loopsdir)" "$(DESTDIR)$(Moondir)" "$(DESTDIR)$(Rallydir)" "$(DESTDIR)$(Snakedir)" "$(DESTDIR)$(Zigzagdir)" "$(DESTDIR)$(Zurichdir)" "$(DESTDIR)$(armorsdir)" "$(DESTDIR)$(carsdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(flash2dir)" "$(DESTDIR)$(fontsdir)" "$(DESTDIR)$(goodydir)" "$(DESTDIR)$(guidir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(jeepdir)" "$(DESTDIR)$(menudir)" "$(DESTDIR)$(miscdir)" "$(DESTDIR)$(motorsdir)" "$(DESTDIR)$(paneldir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(soundsdir)" "$(DESTDIR)$(tiresdir)" "$(DESTDIR)$(vwdir)" "$(DESTDIR)$(z3dir)"; do \
+ for dir in "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(Downtowndir)" "$(DESTDIR)$(Industrialdir)" "$(DESTDIR)$(Loopsdir)" "$(DESTDIR)$(Moondir)" "$(DESTDIR)$(Rallydir)" "$(DESTDIR)$(Snakedir)" "$(DESTDIR)$(Zigzagdir)" "$(DESTDIR)$(Zurichdir)" "$(DESTDIR)$(armorsdir)" "$(DESTDIR)$(carsdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(flash2dir)" "$(DESTDIR)$(fontsdir)" "$(DESTDIR)$(goodydir)" "$(DESTDIR)$(guidir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(jeepdir)" "$(DESTDIR)$(menudir)" "$(DESTDIR)$(miscdir)" "$(DESTDIR)$(motorsdir)" "$(DESTDIR)$(paneldir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(soundsdir)" "$(DESTDIR)$(tiresdir)" "$(DESTDIR)$(vwdir)" "$(DESTDIR)$(z3dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -891,7 +947,7 @@ install-data-am: install-DowntownDATA install-IndustrialDATA \
install-SnakeDATA install-ZigzagDATA install-ZurichDATA \
install-armorsDATA install-carsDATA install-desktopDATA \
install-flash2DATA install-fontsDATA install-goodyDATA \
- install-guiDATA install-iconDATA install-jeepDATA \
+ install-guiDATA install-iconDATA install-jeepDATA install-man \
install-menuDATA install-miscDATA install-motorsDATA \
install-panelDATA install-pkgdataDATA install-soundsDATA \
install-tiresDATA install-vwDATA install-z3DATA
@@ -910,7 +966,7 @@ install-info: install-info-am
install-info-am:
-install-man:
+install-man: install-man6
install-pdf: install-pdf-am
@@ -944,9 +1000,12 @@ uninstall-am: uninstall-DowntownDATA uninstall-IndustrialDATA \
uninstall-armorsDATA uninstall-carsDATA uninstall-desktopDATA \
uninstall-flash2DATA uninstall-fontsDATA uninstall-goodyDATA \
uninstall-guiDATA uninstall-iconDATA uninstall-jeepDATA \
- uninstall-menuDATA uninstall-miscDATA uninstall-motorsDATA \
- uninstall-panelDATA uninstall-pkgdataDATA uninstall-soundsDATA \
- uninstall-tiresDATA uninstall-vwDATA uninstall-z3DATA
+ uninstall-man uninstall-menuDATA uninstall-miscDATA \
+ uninstall-motorsDATA uninstall-panelDATA uninstall-pkgdataDATA \
+ uninstall-soundsDATA uninstall-tiresDATA uninstall-vwDATA \
+ uninstall-z3DATA
+
+uninstall-man: uninstall-man6
.MAKE: install-am install-strip
@@ -960,20 +1019,21 @@ uninstall-am: uninstall-DowntownDATA uninstall-IndustrialDATA \
install-exec install-exec-am install-flash2DATA \
install-fontsDATA install-goodyDATA install-guiDATA \
install-html install-html-am install-iconDATA install-info \
- install-info-am install-jeepDATA install-man install-menuDATA \
- install-miscDATA install-motorsDATA install-panelDATA \
- install-pdf install-pdf-am install-pkgdataDATA install-ps \
- install-ps-am install-soundsDATA install-strip \
- install-tiresDATA install-vwDATA install-z3DATA installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-DowntownDATA \
- uninstall-IndustrialDATA uninstall-LoopsDATA \
- uninstall-MoonDATA uninstall-RallyDATA uninstall-SnakeDATA \
- uninstall-ZigzagDATA uninstall-ZurichDATA uninstall-am \
- uninstall-armorsDATA uninstall-carsDATA uninstall-desktopDATA \
- uninstall-flash2DATA uninstall-fontsDATA uninstall-goodyDATA \
- uninstall-guiDATA uninstall-iconDATA uninstall-jeepDATA \
+ install-info-am install-jeepDATA install-man install-man6 \
+ install-menuDATA install-miscDATA install-motorsDATA \
+ install-panelDATA install-pdf install-pdf-am \
+ install-pkgdataDATA install-ps install-ps-am \
+ install-soundsDATA install-strip install-tiresDATA \
+ install-vwDATA install-z3DATA installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-DowntownDATA uninstall-IndustrialDATA \
+ uninstall-LoopsDATA uninstall-MoonDATA uninstall-RallyDATA \
+ uninstall-SnakeDATA uninstall-ZigzagDATA uninstall-ZurichDATA \
+ uninstall-am uninstall-armorsDATA uninstall-carsDATA \
+ uninstall-desktopDATA uninstall-flash2DATA uninstall-fontsDATA \
+ uninstall-goodyDATA uninstall-guiDATA uninstall-iconDATA \
+ uninstall-jeepDATA uninstall-man uninstall-man6 \
uninstall-menuDATA uninstall-miscDATA uninstall-motorsDATA \
uninstall-panelDATA uninstall-pkgdataDATA uninstall-soundsDATA \
uninstall-tiresDATA uninstall-vwDATA uninstall-z3DATA
diff --git a/resources/trophy.6 b/resources/trophy.6
new file mode 100644
index 0000000..3821a50
--- /dev/null
+++ b/resources/trophy.6
@@ -0,0 +1,55 @@
+.Dd 2001-12-09
+.Dt TROPHY 6
+.Os "Debian GNU/Linux"
+.\" Manual page created by Guus Sliepen <guus at sliepen.warande.net>
+.Sh NAME
+.Nm trophy
+.Nd A 2D car racing action game.
+.Sh SYNOPSIS
+.Nm
+.Sh DESCRIPTION
+.Nm
+is a single-player racing game for Linux. Even though the goal is
+basically to finish the laps as the first,
+.Nm
+is an action game which
+offers much more than just a race. Lots of extras enable "unusual" features
+for races such as shooting, putting mines and many others.
+.Sh CONTROLS
+.Bl -tag -width indent
+.It Arrow Up
+Accelerate.
+.It Arrow Down
+Decelerate. Don't use.
+.It Arrow Left
+Steer to the left.
+.It Arrow Right
+Steer to the right.
+.It A
+Turbo. Boosts speed while pressed (as long as there still is turbo fuel left).
+Use it to overtake other cars or catch up if you've fallen behind.
+.It C
+Drop bomb. Bombs will explode after a second. Use it to damage other cars.
+.It X
+Shoot. Fires your machinegun straight ahead. Make sure you are pointed towards another car.
+.It Space
+Horn. Useless but fun anyway.
+.It Escape
+Stop race, go back to previous menu or quit game.
+.El
+.Sh FILES
+.Bl -tag -width indent
+.It Pa ~/trophy/
+Contains the game saves
+.El
+.Sh AUTHOR
+.Nm
+has been written by
+.An Andrew Mustun,
+.An Matthieu Lecesne and
+.An Colin Pitrat
+.Pp
+This manual page was written by
+.An Guus Sliepen <guus at sliepen.warande.net> and
+.An Matthieu Lecesne
+
diff --git a/resources/trophy.desktop b/resources/trophy.desktop
index d1c2316..f58cadf 100644
--- a/resources/trophy.desktop
+++ b/resources/trophy.desktop
@@ -4,7 +4,7 @@ Type=Application
Name=Trophy
GenericName=Racing Game
Comment=2D car racing game with power-ups
-Icon=trophy.png
+Icon=trophy
TryExec=trophy
Exec=trophy
-Categories=Application;Game;ArcadeGame;
+Categories=Game;ArcadeGame;
diff --git a/src/caresources.cpp b/src/caresources.cpp
index 21df094..2bf4afa 100644
--- a/src/caresources.cpp
+++ b/src/caresources.cpp
@@ -138,7 +138,11 @@ void
CAResources::load() {
// Try to load resource file (resources.dat):
//
- chdir(PKGDATADIR);
+ if (chdir(PKGDATADIR) != 0)
+ {
+ std::cout << "Using local ../resources/resources.xml" << std::endl;
+ // Note : CL_ResourceManager will fail and launch an exception that will be catched by trophy.cpp
+ }
try {
// TODO : Can we just forget the boolean ?
@@ -147,7 +151,6 @@ CAResources::load() {
}
// Just use the resource config file (resources.scr) if there's no compiled .dat:
- //
catch (CL_Error err) {
// TODO : Can we just forget the boolean ?
//resources = new CL_ResourceManager( "resources.scr", false );
diff --git a/src/player.cpp b/src/player.cpp
index 8f1cb24..06117fd 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -459,7 +459,6 @@ Player::checkFunctionMap()
int i;
int px, py;
- unsigned int r,g,b,a;
unsigned int speedNibbleEdge=15;
// Color below car edges:
@@ -476,7 +475,7 @@ Player::checkFunctionMap()
// Get the function pixel under this edge:
//
CL_Color tmp = m_currentTrack->getFunctionalPixel( edge[i][0],edge[i][1] );
- g = tmp.get_green();
+ unsigned int g = tmp.get_green();
// Calculate speed reduction:
//
@@ -530,10 +529,11 @@ Player::checkFunctionMap()
if( !CA_APP->checkCoordinate( px,py ) ) return;
CL_Color tmp = m_currentTrack->getFunctionalPixel( px,py );
- r = tmp.get_red();
- g = tmp.get_green();
- b = tmp.get_blue();
- a = tmp.get_alpha();
+
+ //unsigned int r = tmp.get_red(); // unused yet
+ unsigned int g = tmp.get_green();
+ unsigned int b = tmp.get_blue();
+ // unsigned int a = tmp.get_alpha(); // unused yet
// TODO : It seems to be the contrary (15=fast, ... 0 = slow) ?
unsigned int speedNibble = (g&0xF0)>>4; // Speed regulation (0=fast ... 15=slow)
--
Trophy racing game - Packaging information
More information about the Pkg-games-commits
mailing list