CVS update: Vanilla/ntserv

[Vanilla CVS Development <vanilla-devel@us.netrek.org>]

Date:	Thursday January 6, 19100 @ 3:15
Author:	unbelver

Update of /home/netrek/cvsroot/Vanilla/ntserv
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv2623

Modified Files:
	defs.h 
Log Message:

Ouch, bad bug here.  Voting had its own idea of what MAXPLAYERS is
(PV_TOTAL).  That coupled with vote clearing at entry of new player
slots greater than PV_TOTAL did nasty harm to player struct array.

PV_TOTAL is now forced to track MAXPLAYERS

This one needs a complete re-compile and server re-start.  I don't
think all the dependencies are right in the Makefile.  A make didn't
produce a working server.  I had to make clean; make. For all directories.

--Carlos V.




****************************************

Index: Vanilla/ntserv/defs.h
diff -u Vanilla/ntserv/defs.h:1.11 Vanilla/ntserv/defs.h:1.12
--- Vanilla/ntserv/defs.h:1.11	Thu Dec 30 00:40:01 1999
+++ Vanilla/ntserv/defs.h	Thu Jan  6 03:15:34 2000
@@ -1,4 +1,4 @@
-/* $Id: defs.h,v 1.11 1999/12/30 06:40:01 cameron Exp $
+/* $Id: defs.h,v 1.12 2000/01/06 09:15:34 unbelver Exp $
  */
 
 #ifndef _h_defs
@@ -45,11 +45,6 @@
 #endif
 
 
-#ifdef VOTING
-#define PV_TOTAL	30	/* 20 player slots for eject + 10 reserved
-				   for further use */
-#endif
-
 #define CLUEINTERVAL	9000	/* 30 minute timer */
 #define ONEMINUTE       300
 #define THREEMINUTES    900
@@ -64,6 +59,12 @@
 #define CVOID 		struct player_spacket *
 
 #define MAXPLAYER 36
+
+#ifdef VOTING
+#define PV_TOTAL        MAXPLAYER   /* total number of votable slots */
+#endif
+
+
 #define TESTERS 4	/* Priveledged slots for robots and game 'testers' */
 #define MAXQUEUE 8	/* Number of different  waitqueues */
 #define MAXWAITING 32   /* Number of total people waiting */