Th increase in the numbers of players (MAXPLAYERS) made the index system
on the voting structure obsolete, I increased the number of voting slots and
indexed all the vote commands past where they would overlap with player
slots.
Bill
Index: ./include/defs.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/defs.h,v
retrieving revision 1.3
diff -u -r1.3 defs.h
--- ./include/defs.h 28 Sep 2005 12:14:05 -0000 1.3
+++ ./include/defs.h 10 Apr 2006 06:09:22 -0000
@@ -64,7 +64,7 @@
the rest obs slots */
#ifdef VOTING
-#define PV_TOTAL MAXPLAYER /* total number of votable slots */
+#define PV_TOTAL 2*MAXPLAYER /* total number of votable slots */
#endif
#if defined(NEWBIESERVER) || defined(PRETSERVER)
Index: ./ntserv/ntscmds.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/ntscmds.c,v
retrieving revision 1.3
diff -u -r1.3 ntscmds.c
--- ./ntserv/ntscmds.c 27 Sep 2005 12:26:37 -0000 1.3
+++ ./ntserv/ntscmds.c 10 Apr 2006 06:09:22 -0000
@@ -196,45 +196,45 @@
C_VC_ALL | C_GLOG | C_PR_INPICKUP,
"Start triple planet mayhem by vote",
do_triple_planet_mayhem,
- 2, 22, 0},
+ 2, 32, 0},
{ "BALANCE",
C_VC_ALL | C_GLOG | C_PR_INPICKUP,
"Request team randomise & balance",
do_balance,
- 4, 23, 0 },
+ 4, 33, 0 },
#endif
#if defined(AUTO_INL)
{ "INL",
C_VC_ALL | C_GLOG | C_PR_INPICKUP,
"Start game under INL rules.",
do_start_inl,
- 1, 20, 0 },
+ 1, 34, 0 },
#endif
#if defined(AUTO_PRACTICE)
{ "PRACTICE",
C_VC_ALL | C_PR_INPICKUP,
"Start basepractice by majority vote.",
do_start_basep,
- 1, 20, 0 },
+ 1, 35, 0 },
#endif
#if defined(AUTO_HOCKEY)
{ "HOCKEY",
C_VC_ALL | C_GLOG | C_PR_INPICKUP,
"Start hockey by majority vote.",
do_start_puck,
- 1, 20, 0 },
+ 1, 36, 0 },
#endif
#if defined(AUTO_DOGFIGHT)
{ "DOGFIGHT",
C_VC_ALL | C_GLOG | C_PR_INPICKUP,
"Start dogfight tournament by majority vote.",
do_start_mars,
- 1, 20, 0 },
+ 1, 37, 0 },
#endif
#endif /* VOTING */
{ NULL }
- };
+};
int check_command(struct message *mess)
{