Vanilla Development Mailing List Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS update: Vanilla/ntserv
Date: Thursday March 23, 2000 @ 20:37
Author: karthik
Update of /home/netrek/cvsroot/Vanilla/ntserv
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv23294
Modified Files:
defs.h queue.c
Log Message:
Fixed queue code to properly calculate number of slots based on MAXPLAYER
and TESTERS.
****************************************
Index: Vanilla/ntserv/defs.h
diff -u Vanilla/ntserv/defs.h:1.16 Vanilla/ntserv/defs.h:1.17
--- Vanilla/ntserv/defs.h:1.16 Mon Feb 28 00:48:15 2000
+++ Vanilla/ntserv/defs.h Thu Mar 23 20:37:34 2000
@@ -1,4 +1,4 @@
-/* $Id: defs.h,v 1.16 2000/02/28 06:48:15 cameron Exp $
+/* $Id: defs.h,v 1.17 2000/03/24 02:37:34 karthik Exp $
*/
#ifndef _h_defs
@@ -59,13 +59,15 @@
#define CVOID struct player_spacket *
#define MAXPLAYER 32
+#define TESTERS (MAXPLAYER - 16) /* Reserved slots for observers and robots,
+ by default have 16 player slots and make
+ the rest obs slots */
#ifdef VOTING
#define PV_TOTAL MAXPLAYER /* total number of votable slots */
#endif
-#define TESTERS 4 /* Priveledged slots for robots and game 'testers' */
#define MAXQUEUE 9 /* Number of different waitqueues */
#define MAXWAITING 32 /* Number of total people waiting */
#define QNAMESIZE 20 /* Max length of wait queue name */
Index: Vanilla/ntserv/queue.c
diff -u Vanilla/ntserv/queue.c:1.4 Vanilla/ntserv/queue.c:1.5
--- Vanilla/ntserv/queue.c:1.4 Thu Jan 6 14:45:25 2000
+++ Vanilla/ntserv/queue.c Thu Mar 23 20:37:34 2000
@@ -63,59 +63,59 @@
}
/* Setup the pickup queue */
- queues[QU_PICKUP].free_slots = MAXPLAYER-TESTERS;
- queues[QU_PICKUP].max_slots = MAXPLAYER-TESTERS;
+ queues[QU_PICKUP].free_slots = MAXPLAYER - TESTERS;
+ queues[QU_PICKUP].max_slots = MAXPLAYER - TESTERS;
queues[QU_PICKUP].tournmask = ALLTEAM;
queues[QU_PICKUP].low_slot = 0;
- queues[QU_PICKUP].high_slot = MAXPLAYER-TESTERS;
+ queues[QU_PICKUP].high_slot = MAXPLAYER - TESTERS;
queues[QU_PICKUP].q_flags = QU_OPEN|QU_RESTRICT|QU_REPORT;
queue_setname(QU_PICKUP,"pickup");
queues[QU_ROBOT].free_slots = TESTERS;
queues[QU_ROBOT].max_slots = TESTERS;
queues[QU_ROBOT].tournmask = ALLTEAM;
- queues[QU_ROBOT].low_slot = MAXPLAYER-TESTERS;
+ queues[QU_ROBOT].low_slot = MAXPLAYER - TESTERS;
queues[QU_ROBOT].high_slot = MAXPLAYER;
queues[QU_ROBOT].q_flags = QU_OPEN;
queue_setname(QU_ROBOT,"robot");
queues[QU_HOME].free_slots = 0; /* Off by default, inlbot gives 8 */
- queues[QU_HOME].max_slots = 8;
+ queues[QU_HOME].max_slots = (MAXPLAYER - TESTERS) / 2;
queues[QU_HOME].tournmask = FED;
queues[QU_HOME].low_slot = 0;
- queues[QU_HOME].high_slot = 8;
+ queues[QU_HOME].high_slot = (MAXPLAYER - TESTERS) / 2;
queues[QU_HOME].q_flags = QU_REPORT;
queue_setname(QU_HOME,"home");
queues[QU_AWAY].free_slots = 0; /* Off by default, inlbot gives 8 */
- queues[QU_AWAY].max_slots = 8;
+ queues[QU_AWAY].max_slots = (MAXPLAYER - TESTERS) / 2;
queues[QU_AWAY].tournmask = ROM;
- queues[QU_AWAY].low_slot = 8;
- queues[QU_AWAY].high_slot = 16;
+ queues[QU_AWAY].low_slot = (MAXPLAYER - TESTERS) / 2;
+ queues[QU_AWAY].high_slot = MAXPLAYER - TESTERS;
queues[QU_AWAY].q_flags = QU_REPORT;
queue_setname(QU_AWAY,"away");
queues[QU_HOME_OBS].free_slots = 0; /* Off by default, inlbot gives 2 */
- queues[QU_HOME_OBS].max_slots = 2;
+ queues[QU_HOME_OBS].max_slots = TESTERS / 2;
queues[QU_HOME_OBS].tournmask = FED;
- queues[QU_HOME_OBS].low_slot = 16;
- queues[QU_HOME_OBS].high_slot = 18;
+ queues[QU_HOME_OBS].low_slot = MAXPLAYER - TESTERS;
+ queues[QU_HOME_OBS].high_slot = MAXPLAYER - (TESTERS / 2);
queues[QU_HOME_OBS].q_flags = QU_OBSERVER|QU_REPORT;
queue_setname(QU_HOME_OBS,"home observer");
queues[QU_AWAY_OBS].free_slots = 0; /* Off by default, inlbot gives 2 */
- queues[QU_AWAY_OBS].max_slots = 2;
+ queues[QU_AWAY_OBS].max_slots = TESTERS / 2;
queues[QU_AWAY_OBS].tournmask = ROM;
- queues[QU_AWAY_OBS].low_slot = 18;
- queues[QU_AWAY_OBS].high_slot = 20;
+ queues[QU_AWAY_OBS].low_slot = MAXPLAYER - (TESTERS / 2);
+ queues[QU_AWAY_OBS].high_slot = MAXPLAYER;
queues[QU_AWAY_OBS].q_flags = QU_OBSERVER|QU_REPORT;
queue_setname(QU_AWAY_OBS,"away observer");
- queues[QU_PICKUP_OBS].free_slots = 3; /* Give 3, so a robot can always */
- queues[QU_PICKUP_OBS].max_slots = 3; /* join the game */
+ queues[QU_PICKUP_OBS].free_slots = TESTERS - 1; /* Give 1 less than TESTERS, so a robot can always */
+ queues[QU_PICKUP_OBS].max_slots = TESTERS - 1; /* join the game */
queues[QU_PICKUP_OBS].tournmask = ALLTEAM;
- queues[QU_PICKUP_OBS].low_slot = 16;
- queues[QU_PICKUP_OBS].high_slot = MAXPLAYER;
+ queues[QU_PICKUP_OBS].low_slot = MAXPLAYER - TESTERS;
+ queues[QU_PICKUP_OBS].high_slot = MAXPLAYER - 1;
queues[QU_PICKUP_OBS].q_flags =
QU_OPEN|QU_RESTRICT|QU_OBSERVER|QU_REPORT;
queue_setname(QU_PICKUP_OBS,"pickup observer");
@@ -131,7 +131,7 @@
queues[QU_GOD_OBS].free_slots = MAXPLAYER;
queues[QU_GOD_OBS].max_slots = MAXPLAYER;
queues[QU_GOD_OBS].tournmask = ALLTEAM;
- queues[QU_GOD_OBS].low_slot = (MAXPLAYER-1);
+ queues[QU_GOD_OBS].low_slot = MAXPLAYER - 1;
queues[QU_GOD_OBS].high_slot = MAXPLAYER;
queues[QU_GOD_OBS].q_flags = QU_OPEN|QU_OBSERVER;
queue_setname(QU_GOD_OBS,"god observer");