Re-import of maelstrom as maelstrom-x11 to better show which version it is;

also, the SDL version seems to be the only one that's under development
right now. Requested in pkg/15583 by Ben Wong.

13 files changed, 412 insertions, 0 deletions

diff --git a/games/maelstrom-x11/DESCR b/games/maelstrom-x11/DESCR
new file mode 100644
index 00000000000..9579becd893
--- /dev/null
+++ b/games/maelstrom-x11/DESCR
@@ -0,0 +1,5 @@
+Maelstrom is a port of the original shareware game for the Macintosh.
+It is a fast-action, high resolution (640x480) asteroids-like game,
+with detailed graphics and original sounds.
+
+This is the X11 version, there is also an SDL version (maelstrom-sdl).
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
new file mode 100644
index 00000000000..dc9cd989477
--- /dev/null
+++ b/games/maelstrom-x11/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/07/11 13:26:12 wiz Exp $
+
+DISTNAME=		Maelstrom-1.4.3-L2.0.6-src.tar.gz
+PKGNAME=		maelstrom-x11-2.0.6
+CATEGORIES=		games x11
+MASTER_SITES+=		ftp://ftp.devolution.com/pub/maelstrom/
+MASTER_SITES+=		ftp://ftp.devolution.com/pub/maelstrom/Maelstrom-binaries/
+MASTER_SITES+=		ftp://ftp.devolution.com/pub/maelstrom/Add-Ons/
+DISTFILES=		${DISTNAME} ${STREK} ${SWARS} ${ESOUND}
+
+MAINTAINER=		root@garbled.net
+HOMEPAGE=		http://www.ambrosiasw.com/Products/Maelstrom.html
+COMMENT=		Incredible, fast moving, high graphics version of asteroids (X11 version)
+
+ESOUND=			Maelstrom-Sounds-L2.0.0.tar.gz
+STREK=			Star_Trek.tar.gz
+SWARS=			Star_Wars.tar.gz
+
+CONFLICTS=		maelstrom-[0-9]* maelstrom-sdl-[0-9]*
+
+EXTRACT_ONLY=		${DISTNAME}
+WRKSRC=			${WRKDIR}/Maelstrom
+
+USE_X11BASE=		YES
+USE_XPM=		YES
+EVAL_PREFIX+=		XPMDIR=xpm
+MAKE_ENV+=		BINOWN=${BINOWN} BINGRP=${BINGRP} XPMDIR=${XPMDIR}
+
+post-install:
+	cd ${PREFIX}/share/maelstrom && \
+	${PAX} -rzf ${DISTDIR}/${ESOUND} -p m && \
+	${PAX} -rzf ${DISTDIR}/${STREK} -p m && \
+	${PAX} -rzf ${DISTDIR}/${SWARS} -p m
+	${CHOWN} ${BINOWN}:games ${PREFIX}/bin/Maelstrom
+	${CHMOD} 2755 ${PREFIX}/bin/Maelstrom
+	${CHOWN} ${BINOWN}:games /var/games/Maelstrom-Scores
+	${CHMOD} 0664 /var/games/Maelstrom-Scores
+	${INSTALL_DATA} ${WRKSRC}/README.* ${PREFIX}/share/maelstrom
+	${INSTALL_PROGRAM} ${WRKSRC}/netplayd/netplayd ${PREFIX}/bin/Maelstrom_netplayd
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/games/maelstrom-x11/PLIST b/games/maelstrom-x11/PLIST
new file mode 100644
index 00000000000..1b5dce8f7d6
--- /dev/null
+++ b/games/maelstrom-x11/PLIST
@@ -0,0 +1,59 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/11 13:26:13 wiz Exp $
+bin/Maelstrom
+bin/Maelstrom_netplayd
+bin/Maelstrom_sound
+share/maelstrom/Images/Maelstrom_Icon#100.cicn
+share/maelstrom/Images/Maelstrom_Icon#101.cicn
+share/maelstrom/Images/Maelstrom_Icon#102.cicn
+share/maelstrom/Images/Maelstrom_Icon#103.cicn
+share/maelstrom/Images/Maelstrom_Icon#104.cicn
+share/maelstrom/Images/Maelstrom_Icon#110.cicn
+share/maelstrom/Images/Maelstrom_Icon#128.cicn
+share/maelstrom/Images/Maelstrom_Icon#129.cicn
+share/maelstrom/Images/Maelstrom_Icon#130.cicn
+share/maelstrom/Images/Maelstrom_Icon#131.cicn
+share/maelstrom/Images/Maelstrom_Icon#132.cicn
+share/maelstrom/Images/Maelstrom_Icon#133.cicn
+share/maelstrom/Images/Maelstrom_Icon#134.cicn
+share/maelstrom/Images/Maelstrom_Icon#135.cicn
+share/maelstrom/Images/Maelstrom_Icon#136.cicn
+share/maelstrom/Images/Maelstrom_Icon#137.cicn
+share/maelstrom/Images/Maelstrom_Sprites#128.icon
+share/maelstrom/Images/Maelstrom_Titles#100.icon
+share/maelstrom/Images/Maelstrom_Titles#101.icon
+share/maelstrom/Images/Maelstrom_Titles#102.icon
+share/maelstrom/Images/Maelstrom_Titles#128.icon
+share/maelstrom/Images/Maelstrom_Titles#129.icon
+share/maelstrom/Images/Maelstrom_Titles#130.icon
+share/maelstrom/Images/Maelstrom_Titles#133.icon
+share/maelstrom/Images/Maelstrom_Titles#134.icon
+share/maelstrom/Images/Maelstrom_Titles#135.icon
+share/maelstrom/Images/Maelstrom_Titles#999.icon
+share/maelstrom/Maelstrom Fonts
+share/maelstrom/Maelstrom Sounds
+share/maelstrom/Maelstrom Sprites
+share/maelstrom/NewSounds/Funky_Sounds
+share/maelstrom/NewSounds/Maelstrom Sounds
+share/maelstrom/NewSounds/Martin_Sounds
+share/maelstrom/NewSounds/README
+share/maelstrom/NewSounds/Simpsons_Sounds
+share/maelstrom/README.Options
+share/maelstrom/README.joystick
+share/maelstrom/README.network
+share/maelstrom/Star_Trek/%Maelstrom Sounds
+share/maelstrom/Star_Trek/%Maelstrom Sprites
+share/maelstrom/Star_Trek/HOWTO.txt
+share/maelstrom/Star_Trek/INSTALL.txt
+share/maelstrom/Star_Trek/README_sounds.txt
+share/maelstrom/Star_Trek/README_sprites.txt
+share/maelstrom/Star_Wars/%Maelstrom Sounds
+share/maelstrom/Star_Wars/%Maelstrom Sprites
+share/maelstrom/Star_Wars/HOWTO.txt
+share/maelstrom/Star_Wars/INSTALL.txt
+share/maelstrom/Star_Wars/README_sounds.txt
+share/maelstrom/Star_Wars/README_sprites.txt
+@dirrm share/maelstrom/Star_Trek
+@dirrm share/maelstrom/NewSounds
+@dirrm share/maelstrom/Star_Wars
+@dirrm share/maelstrom/Images
+@dirrm share/maelstrom
diff --git a/games/maelstrom-x11/distinfo b/games/maelstrom-x11/distinfo
new file mode 100644
index 00000000000..366cb98404c
--- /dev/null
+++ b/games/maelstrom-x11/distinfo
@@ -0,0 +1,19 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/07/11 13:26:13 wiz Exp $
+
+SHA1 (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 66c81365104bfab9985919f0cba5a6d955727d79
+Size (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 1463130 bytes
+SHA1 (Star_Trek.tar.gz) = c66dbb40edf6424ff6c4d1b9c1800fdcb731f1a6
+Size (Star_Trek.tar.gz) = 1207676 bytes
+SHA1 (Star_Wars.tar.gz) = 6ea6fcf2e43943d6a2781e35eb03db54855622d2
+Size (Star_Wars.tar.gz) = 723225 bytes
+SHA1 (Maelstrom-Sounds-L2.0.0.tar.gz) = 26f1fb329576fd95d7cd99d5a8b75a85654225b6
+Size (Maelstrom-Sounds-L2.0.0.tar.gz) = 1706928 bytes
+SHA1 (patch-aa) = 5d0752a373284e001ef358a2d653f312a9ec0f31
+SHA1 (patch-ab) = 487e4fcc7de470a8bbb3e51640ce4daf23be373a
+SHA1 (patch-ac) = 81ae36f64ea8db22ba81be8911e05f6c66459edc
+SHA1 (patch-ad) = d5405b696f839c4965fb8e299108aff1b689399a
+SHA1 (patch-ae) = 6f390cca5abbc0b277d22df8efc4ce589e8b0ecb
+SHA1 (patch-af) = 46b5ab4cfe3e20401fc5feaa9319c093b025ca1d
+SHA1 (patch-ag) = aa7102be99466e81b95258a2a2ff888d7136fda3
+SHA1 (patch-ah) = 03a8dcdc19cbcfb6d13a9de80ef529560bb3ad1a
+SHA1 (patch-ai) = 25e781f5092530b35256e17003d998443d479372
diff --git a/games/maelstrom-x11/patches/patch-aa b/games/maelstrom-x11/patches/patch-aa
new file mode 100644
index 00000000000..d303c6a9de3
--- /dev/null
+++ b/games/maelstrom-x11/patches/patch-aa
@@ -0,0 +1,52 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/07/11 13:26:13 wiz Exp $
+
+--- Makeflags.orig	Mon Jul 14 14:32:13 1997
++++ Makeflags	Sun Jul 30 01:32:07 2000
+@@ -1,12 +1,42 @@
++# This file contains the template for Makeflags
+ 
+-# Some sensible defaults
+-BINDIR = /usr/local/bin
+-LIBDIR = /usr/local/lib/Maelstrom
++SYSTEM =
++FEATURES = -DAUDIO_16BIT -DASYNCHRONOUS_IO -DUSE_POSIX_SIGNALS
+ 
+-INSTALL = install
++LOGIC = netlogic
+ 
++XPMINCLUDE = -I$(XPMDIR)/include
++XPMLINKDIR = -Wl,-R$(XPMDIR)/lib -L$(XPMDIR)/lib
++
++BINDIR = $(PREFIX)/bin
++LIBDIR = $(PREFIX)/share/maelstrom
+ DATAFILES = Images/*.icon Images/*.cicn "Maelstrom Fonts" \
+             "Maelstrom Sounds" "Maelstrom Sprites"
+ 
+-all: config
++OBJS = main.o framebuf.o v_framebuf.o x11_framebuf.o vga_framebuf.o \
++       dga_framebuf.o fontserv.o sound.o Mac_Resource.o imagedump.o \
++       init.o $(LOGIC)/$(LOGIC).o \
++       controls.o scores.o dialog.o fastrand.o netscore.o checksum.o \
++       Utils.o shared.o myerror.o
++SOUNDOBJS = Maelstrom_sound.o Mac_Resource.o soundres.o mixer.o shared.o myerror.o
++
++#CXX = c++
++OPTIMIZE = -O2
++X11INCLUDE = -I$(X11BASE)/include
++INCLUDES = -I$(LOGIC) $(X11INCLUDE) $(XPMINCLUDE)
++CFLAGS = $(OPTIMIZE) $(INCLUDES) $(FEATURES) \
++                              -DSYSTEM=\"$(SYSTEM)\" -DLIBDIR=\"$(LIBDIR)\"
++EXTRALIBS =
++X11LINKDIR = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib
++X11LIBS = -lX11 -lXext -lXpm
++CSUMLIB =
++LIBS = $(EXTRALIBS) $(XPMLINKDIR) $(X11LINKDIR) $(X11LIBS) $(CSUMLIB)
++SOUNDLIBS = -lossaudio
++
++INSTALL = /usr/bin/install
++
++all: $(MAELSTROM) netplayd/netplayd
++
++netplayd:
++	cd netplayd && make
+ 
diff --git a/games/maelstrom-x11/patches/patch-ab b/games/maelstrom-x11/patches/patch-ab
new file mode 100644
index 00000000000..c15135a90d9
--- /dev/null
+++ b/games/maelstrom-x11/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/07/11 13:26:13 wiz Exp $
+
+--- bitesex.h.orig	Sun May 25 17:18:10 1997
++++ bitesex.h	Mon Jul 24 17:55:08 2000
+@@ -20,5 +20,5 @@
+ #include <machine/param.h>
+ #else
+-#ifdef __mips
++#if defined(__mips) && !defined(__NetBSD__)
+ #include <sex.h>
+ #else
+@@ -26,5 +26,5 @@
+ #include <sys/machine.h>
+ #else
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <machine/endian.h>
+ #else
+@@ -38,5 +38,5 @@
+ #endif /* Win95 */
+ #endif /* SVR4 */
+-#endif /* FreeBSD */
++#endif /* FreeBSD/NetBSD */
+ #endif /* AIX */
+ #endif /* DEC */
diff --git a/games/maelstrom-x11/patches/patch-ac b/games/maelstrom-x11/patches/patch-ac
new file mode 100644
index 00000000000..f0fcc81605e
--- /dev/null
+++ b/games/maelstrom-x11/patches/patch-ac
@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/07/11 13:26:13 wiz Exp $
+
+--- mixer.h.orig	Sun May 25 23:18:10 1997
++++ mixer.h	Mon Aug  3 00:51:48 1998
+@@ -22,7 +22,7 @@
+ #include <linux/soundcard.h>
+ #undef sparc				/* For sparc Linux */
+ #else
+-#ifdef sparc
++#if defined(sparc) && !defined(__NetBSD__)
+ #ifdef __SVR4   /* Solaris */
+ #include <sys/audioio.h>
+ #else           /* SunOS */
+@@ -38,6 +38,10 @@
+ #endif /* HPUX */
+ #endif /* sparc */
+ #endif /* linux */
++#ifdef __NetBSD__
++#include <sys/signal.h>
++#include <soundcard.h>
++#endif
+ };
+ 
+ #define _PATH_DEV_AUDIO	"/dev/audio"
diff --git a/games/maelstrom-x11/patches/patch-ad b/games/maelstrom-x11/patches/patch-ad
new file mode 100644
index 00000000000..1751ae9c481
--- /dev/null
+++ b/games/maelstrom-x11/patches/patch-ad
@@ -0,0 +1,51 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/07/11 13:26:14 wiz Exp $
+
+--- mixer.cpp.orig	Thu Dec  5 14:14:44 1996
++++ mixer.cpp	Mon Aug  3 01:01:04 1998
+@@ -182,7 +182,7 @@
+ 	}
+ 
+ /* Do some system specific initialization */
+-#ifdef linux
++#if defined(linux) || defined(__NetBSD__)
+ #ifndef PLAY_DEV_AUDIO		/* VoxWare */
+ 	if ( ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &frag_spec) < 0 ) {
+ 		if ( complain )
+@@ -285,7 +285,7 @@
+ 	/* This is necessary so that the sound server stays in sync */
+ 	long flags;
+ 	flags = fcntl(dsp_fd, F_GETFL, 0);
+-	flags |= O_SYNC;
++/*	flags |= O_SYNC;*/
+ 	(void) fcntl(dsp_fd, F_SETFL, flags);
+ 
+ 	return(0);
+@@ -539,7 +539,7 @@
+ 			error("Mixer::Play: ALwritesamps (Play) failed!\n");
+ 		}
+ #else  /* Normal device write */
+-#ifdef sparc
++#if defined(sparc) && !defined(__NetBSD__)
+ 	drain_it:
+ 		if ( ioctl(dsp_fd, AUDIO_DRAIN, 0) < 0 ) {
+ 			if ( errno == EINTR )
+@@ -549,13 +549,14 @@
+ 	write_frag:
+ 		if ( write(dsp_fd, clipped, frag_size*(AUDIO_BITS/8))
+ 						!= frag_size*(AUDIO_BITS/8) ) {
+-			if ( errno == EINTR )  // Interrupted system call...
++			if ( errno == EINTR)  // Interrupted system call...
+ 				// This should happen (SA_RESTART)
+ 				goto write_frag;
+-			else {
+-				perror("Mixer: Can't write to audio device");
+-				return;
+-			}
++			else
++				if ( errno != EAGAIN) {
++					perror("Mixer: Can't write to audio device");
++					return;
++				}
+ 		}
+ #endif /* Not SGI Source */
+ 	} else
diff --git a/games/maelstrom-x11/patches/patch-ae b/games/maelstrom-x11/patches/patch-ae
new file mode 100644
index 00000000000..397d66a2f7b
--- /dev/null
+++ b/games/maelstrom-x11/patches/patch-ae
@@ -0,0 +1,27 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/07/11 13:26:14 wiz Exp $
+--- Makefile.orig	Wed Feb  5 06:12:18 1997
++++ Makefile	Mon Sep 14 12:10:06 1998
+@@ -18,7 +18,7 @@
+ 	@echo "Installing binaries in $(BINDIR)..."
+ 	@for i in $(MAELSTROM) ; do \
+ 		strip $$i; \
+-		$(INSTALL) -m 755 $$i $(BINDIR); \
++		$(INSTALL) -c -m 755 $$i $(BINDIR); \
+ 	done
+ 	@if [ ! -d $(LIBDIR) ]; then \
+ 		mkdir $(LIBDIR); chmod 755 $(LIBDIR); \
+@@ -26,10 +26,11 @@
+ 	@echo "Installing data files in $(LIBDIR) ..."
+ 	@tar cf - $(DATAFILES) | (cd $(LIBDIR); tar xvf -)
+ 	@chmod -R +r $(LIBDIR)
+-	@if [ ! -f "$(LIBDIR)/Maelstrom-Scores" ]; then \
++	@chown -R ${BINOWN}:${BINGRP} $(LIBDIR)
++	@if [ ! -f "/var/games/Maelstrom-Scores" ]; then \
+ 		echo "Installing Maelstrom high-scores file"; \
+-		$(INSTALL) -m 666 Maelstrom-Scores  $(LIBDIR); \
+-		chmod 666 $(LIBDIR)/Maelstrom-Scores; \
++		$(INSTALL) -c -m 666 Maelstrom-Scores  /var/games; \
++		chmod 666 /var/games/Maelstrom-Scores; \
+ 	fi
+ 	@-if [ "$(SYSTEM)" = "Linux" ]; then \
+ 		echo "Fixing permissions for Maelstrom (set-uid root)"; \
diff --git a/games/maelstrom-x11/patches/patch-af b/games/maelstrom-x11/patches/patch-af
new file mode 100644
index 00000000000..757893cbb34
--- /dev/null
+++ b/games/maelstrom-x11/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/07/11 13:26:14 wiz Exp $
+
+--- myerror.cpp.orig	Mon Jul 14 19:41:29 1997
++++ myerror.cpp	Sun Aug  2 20:18:35 1998
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <string.h>
+ 
+ #ifdef __WIN95__
+ #include <windows.h>
diff --git a/games/maelstrom-x11/patches/patch-ag b/games/maelstrom-x11/patches/patch-ag
new file mode 100644
index 00000000000..463b1037aa4
--- /dev/null
+++ b/games/maelstrom-x11/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.1.1.1 2002/07/11 13:26:14 wiz Exp $
+--- scores.cpp.orig	Mon Sep 14 12:06:20 1998
++++ scores.cpp	Mon Sep 14 12:08:28 1998
+@@ -11,7 +11,7 @@
+ #include "Maelstrom_Globals.h"
+ #include "dialog.h"
+ 
+-#define MAELSTROM_SCORES	"Maelstrom-Scores"
++#define MAELSTROM_SCORES	"/var/games/Maelstrom-Scores"
+ #define NUM_SCORES		10		// Do not change this!
+ 
+ /* Everyone can write to scores file if defined to 0 */
+@@ -49,7 +49,7 @@
+ 			gNetScores = 0;
+ 		}
+ 	}
+-	scoresfile = file2libpath(MAELSTROM_SCORES);
++	scoresfile = MAELSTROM_SCORES;
+ 	memset(&hScores, 0, sizeof(hScores));
+ 	if ( (scores_fp=fopen(scoresfile, "r")) == NULL )
+ 		return;
+@@ -72,7 +72,7 @@
+ 	if ( gNetScores )
+ 		return;
+ 
+-	scoresfile = file2libpath(MAELSTROM_SCORES);
++	scoresfile = MAELSTROM_SCORES;
+ #ifndef __WIN95__
+ 	omask=umask(SCORES_PERMMASK);
+ #endif
diff --git a/games/maelstrom-x11/patches/patch-ah b/games/maelstrom-x11/patches/patch-ah
new file mode 100644
index 00000000000..9f7ae150378
--- /dev/null
+++ b/games/maelstrom-x11/patches/patch-ah
@@ -0,0 +1,54 @@
+$NetBSD: patch-ah,v 1.1.1.1 2002/07/11 13:26:14 wiz Exp $
+
+--- netlogic/netplay.cpp.orig	Thu Dec 12 23:14:46 1996
++++ netlogic/netplay.cpp	Tue Dec 11 09:53:18 2001
+@@ -25,6 +25,10 @@
+ #include <arpa/inet.h>
+ #endif /* Win95 */
+ 
++#ifndef socklen_t
++#define	socklen_t unsigned int
++#endif
++
+ int   gNumPlayers;
+ int   gOurPlayer;
+ int   gDeathMatch;
+@@ -352,7 +356,8 @@
+ int SyncNetwork(void)
+ {
+ 	int  nleft;
+-	int  i, clen, len;
++	int  i, len;
++	socklen_t clen;
+ 	struct sockaddr_in from;
+ 	unsigned long frame, seed, newseed;
+ 	struct timeval timeout;
+@@ -567,7 +572,7 @@
+ 	struct timeval timeout;
+ 	fd_set fdset;
+ 	char   netbuf[BUFSIZ];
+-	int    clen;
++	socklen_t clen;
+ 	struct sockaddr_in from;
+ 	
+ 	timeout.tv_sec = 0;
+@@ -807,7 +812,8 @@
+ 	char message[BUFSIZ];
+ 	int  nleft, n;
+ 	int  acked[MAX_PLAYERS];
+-	int  i, clen, len;
++	int  i, len;
++	socklen_t clen;
+ 	struct sockaddr_in from;
+ 	struct timeval timeout;
+ 	fd_set fdset;
+@@ -939,7 +945,8 @@
+ int Await_NewGame(int *Wave, int *Lives, int *Turbo)
+ {
+ 	unsigned char netbuf[BUFSIZ];
+-	int   i, clen, len, gameon;
++	int   i, len, gameon;
++	socklen_t clen;
+ 	struct sockaddr_in from;
+ 	fd_set fdset;
+ 	struct timeval timeout;
diff --git a/games/maelstrom-x11/patches/patch-ai b/games/maelstrom-x11/patches/patch-ai
new file mode 100644
index 00000000000..b6688ab3f36
--- /dev/null
+++ b/games/maelstrom-x11/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2002/07/11 13:26:14 wiz Exp $
+
+--- fastrand.cpp.orig	Mon May 26 04:27:54 1997
++++ fastrand.cpp	Tue Dec 11 09:56:52 2001
+@@ -14,7 +14,7 @@
+ printf("SeedRandom(%lu)\n", Seed);
+ #endif
+ 	if ( ! Seed ) {
+-		gettimeofday(&tv, (void *)0);
++		gettimeofday(&tv, NULL);
+ 		randomSeed = ((tv.tv_usec<<16)|((tv.tv_sec^tv.tv_usec)&0xFFFF));
+ 		return;
+ 	}