Changes 3.0.3:

- fixed bug (missing array boundary check) which could crash the game
- fixed problem with setting mouse cursor in SDL version in fullscreen
- fixed problem with flickering when drawing toon animations
- fixed problem with player animation when snapping and moving
- fixed several nasty bugs that may have caused crashes on some systems
- added envelope content which gets displayed when collecting envelope
- added multiple change event pages for custom elements
- added support for loading various music formats through SDL_mixer
- added music to Supaplex classic level set

3 files changed, 21 insertions, 18 deletions

diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 82485b0843b..b7b6a025d30 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,22 +1,24 @@
-# $NetBSD: Makefile,v 1.14 2003/08/26 15:04:10 adam Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/09 15:05:30 adam Exp $
 #
 
-DISTNAME=		rocksndiamonds-3.0.2
-CATEGORIES=		games x11
-MASTER_SITES=		http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
+DISTNAME=	rocksndiamonds-3.0.3
+CATEGORIES=	games x11
+MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
 
-MAINTAINER=		heinz-rnd@NetBSD.org
-HOMEPAGE=		http://www.artsoft.org/rocksndiamonds/
-COMMENT=		Game like Boulderdash, Emerald Mine, or Sokoban with lots of levels
+MAINTAINER=	heinz-rnd@NetBSD.org
+HOMEPAGE=	http://www.artsoft.org/rocksndiamonds/
+COMMENT=	Game like Boulderdash, Emerald Mine, or Sokoban
 
-USE_GMAKE=		YES
-USE_BUILDLINK2=		YES
-USE_X11=		YES
-ALL_TARGET=		x11
-PLIST_SRC=		${WRKDIR}/PLIST PLIST
+CONFLICTS?=	rocksndiamonds-sdl-[1-9]*
 
-PLIST_SUBST+=		SCORE_PATH=${SCORE_PATH}
-PLIST_SUBST+=		ROCK_INSTALL_DIR="${INSTALL} -d -o games -g games -m 775"
+USE_GMAKE=	YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+ALL_TARGET?=	x11
+# leave the relative path for rocksndiamonds-sdl
+PLIST_SRC=	${WRKDIR}/PLIST ../rocksndiamonds/PLIST
+PLIST_SUBST+=	SCORE_PATH=${SCORE_PATH}
+PLIST_SUBST+=	ROCK_INSTALL_DIR="${INSTALL} -d -o games -g games -m 775"
 
 .if ( ${MACHINE} == "i386" || ${MACHINE} == "prep" || ${MACHINE} == "cats" || \
       ${MACHINE} == "shark" )
diff --git a/games/rocksndiamonds/PLIST b/games/rocksndiamonds/PLIST
index fd15d1ada67..52c8d066921 100644
--- a/games/rocksndiamonds/PLIST
+++ b/games/rocksndiamonds/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/08/05 15:12:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/09/09 15:05:31 adam Exp $
 bin/rocksndiamonds
 man/man1/rocksndiamonds.1
 @dirrm share/rocksndiamonds/sounds/snd_classic
@@ -81,6 +81,7 @@ man/man1/rocksndiamonds.1
 @dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_charles_briscoe-smith
 @dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_ben_braithwaite
 @dirrm share/rocksndiamonds/levels/Contributions_1995-2000
+@dirrm share/rocksndiamonds/levels/Classic_Games/classic_supaplex/music
 @dirrm share/rocksndiamonds/levels/Classic_Games/classic_supaplex
 @dirrm share/rocksndiamonds/levels/Classic_Games/classic_sokoban/tapes
 @dirrm share/rocksndiamonds/levels/Classic_Games/classic_sokoban
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index d17cdbdd97f..092456d9531 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2003/08/26 15:04:10 adam Exp $
+$NetBSD: distinfo,v 1.10 2003/09/09 15:05:31 adam Exp $
 
-SHA1 (rocksndiamonds-3.0.2.tar.gz) = 25386e4a6fa1366e09b3d49735f887d48a26d179
-Size (rocksndiamonds-3.0.2.tar.gz) = 6731838 bytes
+SHA1 (rocksndiamonds-3.0.3.tar.gz) = a98366902933bba6f97feae88adc7676222f0f10
+Size (rocksndiamonds-3.0.3.tar.gz) = 6828235 bytes
 SHA1 (patch-aa) = 5e85dc67f26a2f461f4281f539db44164b9ad34a
 SHA1 (patch-ab) = 565c2fc72b5d9144a8c453745021c2220d23d729
 SHA1 (patch-ag) = 8a80c7d96e508b66ec2ff998f65cbf1b4db45815