Changes 0.16:

	- some minor level changes
	- new level (danger, it's very lethal ;-) )
	- level negotiation
	- fixed bug with -s option
	- lot of cool new graphics
	- optional 3D view
	- killing objects
	- fixed segfault in avi editor, when can't write to a file
	- optimized output files from the avi editor
	- improved avi editor (status bar, hold key)
	- anti-memory leak mechanism (by default turned off for higher performance)
	- fixed several bugs in image loader

5 files changed, 126 insertions, 47 deletions

diff --git a/games/0verkill/Makefile b/games/0verkill/Makefile
index 9f720cf3909..5413391f911 100644
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2005/06/16 06:57:52 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.5 2006/09/07 05:39:37 adam Exp $
 
-DISTNAME=	0verkill-0.15
+DISTNAME=	0verkill-0.16
 CATEGORIES=	games
 MASTER_SITES=	http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/
 EXTRACT_SUFX=	.tgz
@@ -10,27 +9,29 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://artax.karlin.mff.cuni.cz/~brain/0verkill/
 COMMENT=	0verkill is bloody 2D action deathmatch-like game in ASCII-ART
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=		yes
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/0verkill share/doc/0verkill
+INSTALLATION_DIRS+=	share/0verkill/data share/0verkill/grx
 
-post-patch:
-	${SED} "s|@PREFIX@|${PREFIX}|g" ${WRKSRC}/cfg.h > ${WRKSRC}/cfg.h.done
-	${MV} ${WRKSRC}/cfg.h.done ${WRKSRC}/cfg.h
-	${SED} "s|grx/|${PREFIX}/share/0verkill/grx/|g" ${WRKSRC}/data/sprites.dat \
-		> ${WRKSRC}/data/sprites.dat.done
-	${MV} ${WRKSRC}/data/sprites.dat.done ${WRKSRC}/data/sprites.dat
+SUBST_CLASSES+=		grx
+SUBST_STAGE.grx=	post-patch
+SUBST_MESSAGE.grx=	Fix game data paths
+SUBST_FILES.grx=	data/sprites.dat data/level1.sp data/level2.sp
+SUBST_SED.grx=		-e "s|grx/|${PREFIX}/share/0verkill/grx/|g"
+
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	post-patch
+SUBST_MESSAGE.prefix=	Fix game configuration path prefix
+SUBST_FILES.prefix=	cfg.h
+SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/0verkill \
-		${PREFIX}/share/doc/0verkill ${PREFIX}/share/0verkill/data \
-		${PREFIX}/share/0verkill/grx
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} 0verkill ${PREFIX}/bin
 	cd ${WRKSRC} && for f in avi bot editor server test_server; do \
 		${INSTALL_PROGRAM} $$f ${PREFIX}/bin/0verkill-$$f; \
 	done
-	cd ${WRKSRC}/data && ${INSTALL_DATA} banner.dat dynamic.dat room.dat \
-		sprites.dat ${PREFIX}/share/0verkill/data
+	${INSTALL_DATA} ${WRKSRC}/data/* ${PREFIX}/share/0verkill/data
 	${INSTALL_DATA} ${WRKSRC}/grx/* ${PREFIX}/share/0verkill/grx
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} AUTHORS README.html avi.txt \
 		bot.txt doc.html ${PREFIX}/share/doc/0verkill
diff --git a/games/0verkill/PLIST b/games/0verkill/PLIST
index 376a0e4496e..0f0975831e6 100644
--- a/games/0verkill/PLIST
+++ b/games/0verkill/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:50:35 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/09/07 05:39:37 adam Exp $
 bin/0verkill
 bin/0verkill-avi
 bin/0verkill-bot
@@ -6,27 +6,40 @@ bin/0verkill-editor
 bin/0verkill-server
 bin/0verkill-test_server
 share/0verkill/data/banner.dat
-share/0verkill/data/dynamic.dat
-share/0verkill/data/room.dat
+share/0verkill/data/level.dat
+share/0verkill/data/level1.dn
+share/0verkill/data/level1.sp
+share/0verkill/data/level1.st
+share/0verkill/data/level2.dn
+share/0verkill/data/level2.sp
+share/0verkill/data/level2.st
 share/0verkill/data/sprites.dat
-share/doc/0verkill/AUTHORS
-share/doc/0verkill/README.html
-share/doc/0verkill/avi.txt
-share/doc/0verkill/bot.txt
-share/doc/0verkill/doc.html
 share/0verkill/grx/0verkill.avi
+share/0verkill/grx/ackermann.avi
+share/0verkill/grx/altar.avi
 share/0verkill/grx/ammo.avi
+share/0verkill/grx/anthrax.avi
 share/0verkill/grx/armor.avi
 share/0verkill/grx/barrel.avi
 share/0verkill/grx/barrel_fire.avi
 share/0verkill/grx/bedna.avi
 share/0verkill/grx/bedna_v.avi
+share/0verkill/grx/bednarek.avi
 share/0verkill/grx/beer.avi
+share/0verkill/grx/beran.avi
+share/0verkill/grx/bici.avi
+share/0verkill/grx/biohazard.avi
 share/0verkill/grx/blood.avi
 share/0verkill/grx/bulge.avi
 share/0verkill/grx/bullet.avi
+share/0verkill/grx/bus.avi
+share/0verkill/grx/camel.avi
 share/0verkill/grx/cartridge.avi
 share/0verkill/grx/chain1.avi
+share/0verkill/grx/chain2.avi
+share/0verkill/grx/chain3.avi
+share/0verkill/grx/closed.avi
+share/0verkill/grx/cloud.avi
 share/0verkill/grx/corpse1.avi
 share/0verkill/grx/corpse2.avi
 share/0verkill/grx/corpse3.avi
@@ -59,12 +72,18 @@ share/0verkill/grx/corpse_girl_E.avi
 share/0verkill/grx/corpse_girl_F.avi
 share/0verkill/grx/corpse_girl_univ.avi
 share/0verkill/grx/corpse_univ.avi
+share/0verkill/grx/cowboys.avi
+share/0verkill/grx/dekl.avi
+share/0verkill/grx/domecek.avi
 share/0verkill/grx/door.avi
 share/0verkill/grx/dope.avi
 share/0verkill/grx/dvirka.avi
 share/0verkill/grx/erectus.avi
 share/0verkill/grx/fan.avi
+share/0verkill/grx/favo.avi
 share/0verkill/grx/footboard.avi
+share/0verkill/grx/forum.avi
+share/0verkill/grx/gentlemen.avi
 share/0verkill/grx/girl1.avi
 share/0verkill/grx/girl2.avi
 share/0verkill/grx/girl3.avi
@@ -86,7 +105,12 @@ share/0verkill/grx/grave2.avi
 share/0verkill/grx/grave3.avi
 share/0verkill/grx/grenade.avi
 share/0verkill/grx/grenades.avi
+share/0verkill/grx/guitarist1.avi
+share/0verkill/grx/guitarist2.avi
+share/0verkill/grx/guitarist3.avi
 share/0verkill/grx/gun.avi
+share/0verkill/grx/hajzl.avi
+share/0verkill/grx/hajzlik.avi
 share/0verkill/grx/hellslime.avi
 share/0verkill/grx/hero1.avi
 share/0verkill/grx/hero2.avi
@@ -104,29 +128,69 @@ share/0verkill/grx/heroD.avi
 share/0verkill/grx/heroE.avi
 share/0verkill/grx/heroF.avi
 share/0verkill/grx/hero_univ.avi
+share/0verkill/grx/heute.avi
 share/0verkill/grx/hit.avi
 share/0verkill/grx/hlina.avi
 share/0verkill/grx/hook.avi
+share/0verkill/grx/humpolec.avi
+share/0verkill/grx/kamelky.avi
 share/0verkill/grx/kanal.avi
+share/0verkill/grx/klesani.avi
+share/0verkill/grx/koleje.avi
+share/0verkill/grx/kotel.avi
+share/0verkill/grx/kotelna.avi
+share/0verkill/grx/kotelnik.avi
 share/0verkill/grx/koubek.avi
+share/0verkill/grx/krovi.avi
 share/0verkill/grx/ladder.avi
+share/0verkill/grx/ladies.avi
 share/0verkill/grx/lamp1.avi
 share/0verkill/grx/lamp2.avi
 share/0verkill/grx/lamp3.avi
+share/0verkill/grx/lava.avi
+share/0verkill/grx/lava1.avi
+share/0verkill/grx/lava2.avi
+share/0verkill/grx/lebzhnaty.avi
+share/0verkill/grx/links.avi
+share/0verkill/grx/liqory.avi
 share/0verkill/grx/make_hero
+share/0verkill/grx/mar.avi
 share/0verkill/grx/medikit.avi
+share/0verkill/grx/melasa.avi
 share/0verkill/grx/mess.avi
 share/0verkill/grx/mess1.avi
 share/0verkill/grx/mess2.avi
 share/0verkill/grx/mess3.avi
 share/0verkill/grx/mess4.avi
+share/0verkill/grx/metro.avi
 share/0verkill/grx/noise.avi
+share/0verkill/grx/nosmoking.avi
+share/0verkill/grx/ohrada.avi
 share/0verkill/grx/okno.avi
+share/0verkill/grx/para.avi
+share/0verkill/grx/perm.avi
+share/0verkill/grx/petice.avi
+share/0verkill/grx/pi.avi
+share/0verkill/grx/pillar.avi
 share/0verkill/grx/pipe.avi
 share/0verkill/grx/pipe1.avi
+share/0verkill/grx/pipe2.avi
+share/0verkill/grx/pipe3.avi
+share/0verkill/grx/pipe4.avi
+share/0verkill/grx/pivrnec.avi
+share/0verkill/grx/podium.avi
 share/0verkill/grx/podlaha.avi
 share/0verkill/grx/prkno.avi
+share/0verkill/grx/pruhonice.avi
+share/0verkill/grx/pub.avi
+share/0verkill/grx/pumping.avi
+share/0verkill/grx/pytlak.avi
 share/0verkill/grx/radioactive.avi
+share/0verkill/grx/raid.avi
+share/0verkill/grx/raidrekl.avi
+share/0verkill/grx/rampa.avi
+share/0verkill/grx/reklama.avi
+share/0verkill/grx/rg6.avi
 share/0verkill/grx/rifle.avi
 share/0verkill/grx/rocket.avi
 share/0verkill/grx/rough.avi
@@ -151,19 +215,39 @@ share/0verkill/grx/skull.avi
 share/0verkill/grx/slug.avi
 share/0verkill/grx/smoker.avi
 share/0verkill/grx/sshell.avi
+share/0verkill/grx/stone.avi
+share/0verkill/grx/stone1.avi
+share/0verkill/grx/stone2.avi
+share/0verkill/grx/stone3.avi
+share/0verkill/grx/stone_steps_l.avi
+share/0verkill/grx/stone_steps_r.avi
+share/0verkill/grx/sugar.avi
+share/0verkill/grx/svab.avi
 share/0verkill/grx/swing_lamp.avi
+share/0verkill/grx/tabule.avi
 share/0verkill/grx/tnt.avi
 share/0verkill/grx/toadstool.avi
 share/0verkill/grx/traverza.avi
 share/0verkill/grx/traverza1.avi
 share/0verkill/grx/traverza2.avi
+share/0verkill/grx/u_kuceru.avi
+share/0verkill/grx/uhli.avi
 share/0verkill/grx/uzi.avi
+share/0verkill/grx/vetrak.avi
+share/0verkill/grx/waltr.avi
 share/0verkill/grx/water.avi
 share/0verkill/grx/zabradli.avi
+share/0verkill/grx/zarivka.avi
 share/0verkill/grx/zebrik2.avi
 share/0verkill/grx/zed.avi
 share/0verkill/grx/zed2.avi
 share/0verkill/grx/zed3.avi
+share/0verkill/grx/zpevak.avi
+share/doc/0verkill/AUTHORS
+share/doc/0verkill/README.html
+share/doc/0verkill/avi.txt
+share/doc/0verkill/bot.txt
+share/doc/0verkill/doc.html
 @dirrm share/doc/0verkill
 @dirrm share/0verkill/grx
 @dirrm share/0verkill/data
diff --git a/games/0verkill/distinfo b/games/0verkill/distinfo
index e66b16f9a4c..688fad4fb6e 100644
--- a/games/0verkill/distinfo
+++ b/games/0verkill/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 23:11:54 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/09/07 05:39:37 adam Exp $
 
-SHA1 (0verkill-0.15.tgz) = 30350d1d5660e9deb070276cf6ec72febe8dfdbe
-RMD160 (0verkill-0.15.tgz) = 89c864601f113f543f69aced2db6d95afd7e46ba
-Size (0verkill-0.15.tgz) = 253582 bytes
-SHA1 (patch-aa) = bc1cb81b46b369d7672950ca2099494b1fe65f89
-SHA1 (patch-ab) = 9716650e78d0293d0e173d056fb3e6ced19006f4
+SHA1 (0verkill-0.16.tgz) = 6ce4152f20709175e0bad80cc79ec00e2064a100
+RMD160 (0verkill-0.16.tgz) = fdf7a132dfa0312d8d732b2bf2999e7264685eec
+Size (0verkill-0.16.tgz) = 276579 bytes
+SHA1 (patch-aa) = 76aabb51290a414298dcb4a9c954b0f41467ca3f
+SHA1 (patch-ab) = 01793413fb1f2eafeaed2dc5d7532b2269a8d38a
diff --git a/games/0verkill/patches/patch-aa b/games/0verkill/patches/patch-aa
index 8055c52fac6..649f027752d 100644
--- a/games/0verkill/patches/patch-aa
+++ b/games/0verkill/patches/patch-aa
@@ -1,19 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/05 18:55:32 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/09/07 05:39:37 adam Exp $
 
---- cfg.h.orig	Mon Jan 22 17:33:36 2001
+--- cfg.h.orig	2001-12-16 16:48:56.000000000 +0100
 +++ cfg.h
-@@ -16,10 +16,10 @@
+@@ -22,7 +22,7 @@
  #define DEFAULT_FONT_NAME "-misc-fixed-bold-r-normal-*-13-*-*-*-c-*-iso8859-*"
  
  
--#define SPRITES_FILE "data/sprites.dat"
--#define DATA_FILE "data/room.dat"
--#define DYNAMIC_DATA_FILE "data/dynamic.dat"
--#define BANNER_FILE "data/banner.dat"
-+#define SPRITES_FILE "@PREFIX@/share/0verkill/data/sprites.dat"
-+#define DATA_FILE "@PREFIX@/share/0verkill/data/room.dat"
-+#define DYNAMIC_DATA_FILE "@PREFIX@/share/0verkill/data/dynamic.dat"
-+#define BANNER_FILE "@PREFIX@/share/0verkill/data/banner.dat"
- #define CFG_FILE ".0verkill"
- 
- #define AREA_X 1000
+-#define DATA_PATH "data/"
++#define DATA_PATH "@PREFIX@/share/0verkill/data/"
+ #define LEVEL_FILE "level.dat"
+ #define GAME_SPRITES_FILE "sprites.dat"
+ #define BANNER_FILE "banner.dat"
diff --git a/games/0verkill/patches/patch-ab b/games/0verkill/patches/patch-ab
index 02e1003e0e7..e89635930e9 100644
--- a/games/0verkill/patches/patch-ab
+++ b/games/0verkill/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2004/06/15 13:31:15 grant Exp $
+$NetBSD: patch-ab,v 1.3 2006/09/07 05:39:37 adam Exp $
 
---- Makefile.in.orig	2000-12-21 21:48:18.000000000 +1100
+--- Makefile.in.orig	2001-12-15 18:51:54.000000000 +0100
 +++ Makefile.in
 @@ -1,4 +1,4 @@
--CFLAGS=-O3 @CFLAGS@ @X_CFLAGS@ -Wall -W -Wstrict-prototypes -Wno-parentheses -fomit-frame-pointer 
+-CFLAGS=@CFLAGS@ -O3 @X_CFLAGS@ -Wall -W -Wstrict-prototypes -Wno-parentheses -fomit-frame-pointer 
 +CFLAGS=@CFLAGS@ @X_CFLAGS@ # -Wall -W -Wstrict-prototypes -Wno-parentheses -fomit-frame-pointer 
  #-malign-functions=0
  LDFLAGS=@LDFLAGS@