Changes 3.0.8:

- added "musicinfo.conf" for menu and level music configuration
- added "editorsetup.conf" for editor element list configuration
- added "copy" and "exchange" functions for custom elements to editor
- added configurable "bored" and "sleeping" animations for the player
- added "awakening" sound for player when waking up after sleeping
- added configurable element animations for info screen
- added configurable music credits for info screen
- added configurable level set information for info screen
- added warnings for undefined token values in artwork config files
- menu entries now also selectable by clicking on entry text
- better sniksnak turning movement (two steps instead of only one)
- fixed turning movement of butterflies and fireflies (no frame reset)
- fixed bug with wrong default impact sound for colored emeralds
- fixed bug with double nut cracking sound
- fixed a very nasty bug in dragon turning code in TurnRoundExt()
- finally fixed tape recording when player is created from CE change
- added new contributed levels

5 files changed, 29 insertions, 23 deletions

diff --git a/games/rocksndiamonds-sdl/distinfo b/games/rocksndiamonds-sdl/distinfo
index 70b8bee59d8..d32bb040ad9 100644
--- a/games/rocksndiamonds-sdl/distinfo
+++ b/games/rocksndiamonds-sdl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2003/11/19 12:49:06 adam Exp $
+$NetBSD: distinfo,v 1.6 2003/12/15 14:48:10 adam Exp $
 
-SHA1 (rocksndiamonds-3.0.7.tar.gz) = 0f871a205392877552fee29300577130da306423
-Size (rocksndiamonds-3.0.7.tar.gz) = 6857394 bytes
+SHA1 (rocksndiamonds-3.0.8.tar.gz) = 2577ceaa179c7974b339316c6dac2ab9846ce654
+Size (rocksndiamonds-3.0.8.tar.gz) = 7179240 bytes
 SHA1 (patch-aa) = 824bf9ef3ee1335a8a412d4cfd3bbf7ea13d3f46
 SHA1 (patch-ab) = 892d13a04cb67d3a90701ed428c00e6be0737d1b
 SHA1 (patch-ag) = 8a80c7d96e508b66ec2ff998f65cbf1b4db45815
 SHA1 (patch-ah) = 584b406eef29b2849f7fc42181a7b9f29e6c9c69
-SHA1 (patch-ak) = c4303fd5a4d7781127063fe81724f518c5359746
+SHA1 (patch-ak) = 2d3f3c4b3018bd0be9b299e17eef64049ea85781
diff --git a/games/rocksndiamonds/Makefile.common b/games/rocksndiamonds/Makefile.common
index d4b8794a258..c7f3a8e591c 100644
--- a/games/rocksndiamonds/Makefile.common
+++ b/games/rocksndiamonds/Makefile.common
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.common,v 1.4 2003/11/19 12:48:47 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/12/15 14:47:37 adam Exp $
 #
 
-DISTNAME=	rocksndiamonds-3.0.7
+DISTNAME=	rocksndiamonds-3.0.8
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
 
 MAINTAINER=	heinz-rnd@NetBSD.org
 HOMEPAGE=	http://www.artsoft.org/rocksndiamonds/
 
-USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
-USE_X11=	YES
+USE_BUILDLINK2=		YES
+USE_GMAKE=		YES
+USE_X11=		YES
 
 PLIST_SRC=	${WRKDIR}/PLIST ../rocksndiamonds/PLIST
 PLIST_SUBST+=	SCORE_PATH=${SCORE_PATH}
@@ -18,7 +18,7 @@ PLIST_SUBST+=	ROCK_INSTALL_DIR="${INSTALL} -d -o games -g games -m 775"
 
 .if ( ${MACHINE} == "i386" || ${MACHINE} == "prep" || ${MACHINE} == "cats" || \
       ${MACHINE} == "shark" )
-MAKE_ENV+=HAVE_JOYSTICK=1
+MAKE_ENV+=	HAVE_JOYSTICK=1
 .endif
 
 SCORE_PATH=		/var/games/rocksndiamonds
diff --git a/games/rocksndiamonds/PLIST b/games/rocksndiamonds/PLIST
index 52c8d066921..52736f5978f 100644
--- a/games/rocksndiamonds/PLIST
+++ b/games/rocksndiamonds/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/09 15:05:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/15 14:47:37 adam Exp $
 bin/rocksndiamonds
 man/man1/rocksndiamonds.1
 @dirrm share/rocksndiamonds/sounds/snd_classic
@@ -14,12 +14,18 @@ man/man1/rocksndiamonds.1
 @dirrm share/rocksndiamonds/levels/Examples/example_andreas_buschbeck/graphics
 @dirrm share/rocksndiamonds/levels/Examples/example_andreas_buschbeck
 @dirrm share/rocksndiamonds/levels/Examples
+@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_sebastian_simon/tapes
+@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_sebastian_simon
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_sam_bateman/tapes
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_sam_bateman
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_richard_valvona
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_randy_johannessen/tapes
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_randy_johannessen
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_rafael_gatti
+@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_paul_e_collins_iii/tapes
+@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_paul_e_collins_iii
+@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_krystian_abramowicz/tapes
+@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_krystian_abramowicz
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_jorge_jordan
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_gavin_davidson/tapes
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_gavin_davidson
@@ -27,11 +33,13 @@ man/man1/rocksndiamonds.1
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_emanuel_schmieg/sounds
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_emanuel_schmieg/graphics
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_emanuel_schmieg
+@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_efraim_yawitz
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_edward_leuf/tapes
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_edward_leuf/sounds
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_edward_leuf/music
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_edward_leuf/graphics
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_edward_leuf
+@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_audrius_saikunas
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_andreas_buschbeck/tapes
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_andreas_buschbeck/sounds
 @dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_andreas_buschbeck/graphics
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index 82958d3d0ce..9457d083d07 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2003/11/19 12:48:47 adam Exp $
+$NetBSD: distinfo,v 1.15 2003/12/15 14:47:37 adam Exp $
 
-SHA1 (rocksndiamonds-3.0.7.tar.gz) = 0f871a205392877552fee29300577130da306423
-Size (rocksndiamonds-3.0.7.tar.gz) = 6857394 bytes
+SHA1 (rocksndiamonds-3.0.8.tar.gz) = 2577ceaa179c7974b339316c6dac2ab9846ce654
+Size (rocksndiamonds-3.0.8.tar.gz) = 7179240 bytes
 SHA1 (patch-aa) = 824bf9ef3ee1335a8a412d4cfd3bbf7ea13d3f46
 SHA1 (patch-ab) = 892d13a04cb67d3a90701ed428c00e6be0737d1b
 SHA1 (patch-ag) = 8a80c7d96e508b66ec2ff998f65cbf1b4db45815
 SHA1 (patch-ah) = 584b406eef29b2849f7fc42181a7b9f29e6c9c69
-SHA1 (patch-ak) = c4303fd5a4d7781127063fe81724f518c5359746
+SHA1 (patch-ak) = 2d3f3c4b3018bd0be9b299e17eef64049ea85781
diff --git a/games/rocksndiamonds/patches/patch-ak b/games/rocksndiamonds/patches/patch-ak
index 75e140a8f91..214e422f307 100644
--- a/games/rocksndiamonds/patches/patch-ak
+++ b/games/rocksndiamonds/patches/patch-ak
@@ -1,21 +1,19 @@
-$NetBSD: patch-ak,v 1.2 2003/08/05 15:12:47 adam Exp $
+$NetBSD: patch-ak,v 1.3 2003/12/15 14:47:37 adam Exp $
 
---- src/libgame/system.c.orig	2003-08-04 23:01:27.000000000 +0200
+--- src/libgame/system.c.orig	2003-12-13 23:30:41.000000000 +0000
 +++ src/libgame/system.c
-@@ -1163,10 +1163,16 @@ inline void InitJoysticks()
+@@ -1162,10 +1162,14 @@ inline void InitJoysticks()
    return;	/* joysticks generally deactivated by compile-time directive */
  #endif
  
 +  /* pkgsrc: InitJoystick will be called more than once, so reset
-+   * the state variable 'joystick' only if there's no joystick available
-+   * (yet).
++   * the state variable 'joystick' only if there's no joystick available (yet)
 +   */
    /* always start with reliable default values */
 -  joystick.status = JOYSTICK_NOT_AVAILABLE;
--  for (i=0; i<MAX_PLAYERS; i++)
+-  for (i = 0; i < MAX_PLAYERS; i++)
 -    joystick.fd[i] = -1;		/* joystick device closed */
-+  if (joystick.status == JOYSTICK_NOT_AVAILABLE)
-+  {
++  if (joystick.status == JOYSTICK_NOT_AVAILABLE) {
 +    for (i=0; i<MAX_PLAYERS; i++)
 +      joystick.fd[i] = -1;		/* joystick device closed */
 +  }