Date:	Monday July 7, 2003 @ 17:19
Author:	ahn

Update of /home/netrek/cvsroot/Vanilla/include
In directory swashbuckler.real-time.com:/var/tmp/cvs-serv701/include

Modified Files:
	config.h.in data.h defs.h packets.h struct.h sysdefaults.h 
Log Message:
* Pre-T mode enhancement from Nick Slager, enabled by default.  See
  RGN for details.



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

Index: Vanilla/include/config.h.in
diff -u Vanilla/include/config.h.in:1.3 Vanilla/include/config.h.in:1.4
--- Vanilla/include/config.h.in:1.3	Fri Jun 21 02:41:35 2002
+++ Vanilla/include/config.h.in	Mon Jul  7 17:19:55 2003
@@ -306,6 +306,9 @@
                                 /* NEWBIESERVER    - twinkserver support */
 #define NEWBIESERVER
 
+                                /* PRETSERVER      - pre-T bot  support */
+#define PRETSERVER
+
                                 /* NEW_CREDIT      - give 1 planet for
                                                      destroying, two planets
                                                      for taking.  Be sure to
Index: Vanilla/include/data.h
diff -u Vanilla/include/data.h:1.2 Vanilla/include/data.h:1.3
--- Vanilla/include/data.h:1.2	Thu May 10 05:37:11 2001
+++ Vanilla/include/data.h	Mon Jul  7 17:19:55 2003
@@ -1,4 +1,4 @@
-/* $Id: data.h,v 1.2 2001/05/10 10:37:11 quisar Exp $
+/* $Id: data.h,v 1.3 2003/07/07 22:19:55 ahn Exp $
  */
 
 #ifndef _h_data
@@ -288,7 +288,10 @@
 #ifdef NEWBIESERVER
 extern char Newbie[FNAMESIZE];
 #endif
-#if defined(BASEPRACTICE) || defined(NEWBIESERVER)
+#ifdef PRETSERVER
+extern char PreT[FNAMESIZE];
+#endif
+#if defined(BASEPRACTICE) || defined(NEWBIESERVER) || defined(PRETSERVER)
 extern char Robodir[FNAMESIZE];
 extern char robofile[FNAMESIZE];
 extern char robot_host[FNAMESIZE];
@@ -333,5 +336,8 @@
 
 extern char Cambot[FNAMESIZE];
 extern char Cambot_out[FNAMESIZE];
+
+/*this is also defined in ../robotd/data.h*/
+#define PRE_T_ROBOT_LOGIN "Pre_T_Robot!"
 
 #endif /* _h_data */
Index: Vanilla/include/defs.h
diff -u Vanilla/include/defs.h:1.1 Vanilla/include/defs.h:1.2
--- Vanilla/include/defs.h:1.1	Tue May  1 21:00:19 2001
+++ Vanilla/include/defs.h	Mon Jul  7 17:19:55 2003
@@ -1,4 +1,4 @@
-/* $Id: defs.h,v 1.1 2001/05/02 02:00:19 cameron Exp $
+/* $Id: defs.h,v 1.2 2003/07/07 22:19:55 ahn Exp $
  */
 
 #ifndef _h_defs
@@ -67,7 +67,7 @@
 #define PV_TOTAL        MAXPLAYER   /* total number of votable slots */
 #endif
 
-#ifdef NEWBIESERVER
+#if defined(NEWBIESERVER) || defined(PRETSERVER)
 #define MAXQUEUE 13	/* Number of different  waitqueues */
 #else
 #define MAXQUEUE 9
@@ -252,7 +252,12 @@
 #define NEWBIE_ROBOT	5
 #endif
 
-#if defined(BASEPRACTICE) || defined(NEWBIESERVER)
+#ifdef PRETSERVER
+#define N_PRET		"pret"
+#define PRET_ROBOT	6
+#endif
+
+#if defined(BASEPRACTICE) || defined(NEWBIESERVER) || defined(PRETSERVER)
 #define N_ROBODIR       "og"
 #endif
 
Index: Vanilla/include/packets.h
diff -u Vanilla/include/packets.h:1.1 Vanilla/include/packets.h:1.2
--- Vanilla/include/packets.h:1.1	Tue May  1 21:00:19 2001
+++ Vanilla/include/packets.h	Mon Jul  7 17:19:55 2003
@@ -1,4 +1,4 @@
-/* $Id: packets.h,v 1.1 2001/05/02 02:00:19 cameron Exp $
+/* $Id: packets.h,v 1.2 2003/07/07 22:19:55 ahn Exp $
  */
 
 /* 
@@ -136,7 +136,7 @@
 #define CP_S_RESERVED	46
 #define CP_S_DUMMY	47
 
-#if defined(BASEPRACTICE) || defined(NEWBIESERVER)
+#if defined(BASEPRACTICE) || defined(NEWBIESERVER) || defined(PRETSERVER)
 #define CP_OGGV         50
 #endif
 
@@ -910,7 +910,7 @@
   };
 
 
-#if defined(BASEPRACTICE) || defined(NEWBIESERVER)
+#if defined(BASEPRACTICE) || defined(NEWBIESERVER) || defined(PRETSERVER)
 struct oggv_cpacket {
    char                 type;   /* CP_OGGV */
    u_char		def;    /* defense 1-100 */
Index: Vanilla/include/struct.h
diff -u Vanilla/include/struct.h:1.5 Vanilla/include/struct.h:1.6
--- Vanilla/include/struct.h:1.5	Mon Dec  9 01:08:39 2002
+++ Vanilla/include/struct.h	Mon Jul  7 17:19:55 2003
@@ -41,6 +41,10 @@
 #define  QU_NEWBIE_BOT 10   /* Newbie server robots */
 #define  QU_NEWBIE_OBS 11   /* Newbie server observers */
 #define  QU_NEWBIE_DMN 12   /* Newbie server daemon */
+#define  QU_PRET_PLR   9    /* Pre-T server players */
+#define  QU_PRET_BOT   10   /* Pre-T server robots */
+#define  QU_PRET_OBS   11   /* Pre-T server observers */
+#define  QU_PRET_DMN   12   /* Pre-T server daemon */
 /*
  * Queue flag definitions.
  */
@@ -89,6 +93,10 @@
 #define ispaused ((status->gameup) & GU_PAUSED)
 #define GU_INROBOT 16			/* INL robot is present	*/
 #define GU_NEWBIE 32
+#define GU_PRET 64
+#define pre_t_mode ((status->gameup) & GU_PRET)
+#define GU_BOT_IN_GAME 128
+#define bot_in_game ((status->gameup) & GU_BOT_IN_GAME)
 
 /* values of p_status */
 #define PFREE 		   0x0000
@@ -136,7 +144,7 @@
 #define PFTWARP	       0x40000000	/* isae -- SB transwarp */
 #endif
 
-#if defined(BASEPRACTICE) || defined(NEWBIESERVER)
+#if defined(BASEPRACTICE) || defined(NEWBIESERVER) ||  defined(PRETSERVER)
 #define PFBPROBOT      0x80000000
 #endif
 
@@ -378,7 +386,7 @@
 #endif
     int p_timerdelay;           /* updates per second */
     pid_t p_process;            /* process id number */
-#if defined(BASEPRACTICE) || defined(NEWBIESERVER)
+#if defined(BASEPRACTICE) || defined(NEWBIESERVER) ||  defined(PRETSERVER)
     /* robot ogger variables */
     int p_df;			/* defense (0 unknown, 1 worst, 100 best) */
     int p_tg;			/* target+1 */
Index: Vanilla/include/sysdefaults.h
diff -u Vanilla/include/sysdefaults.h:1.2 Vanilla/include/sysdefaults.h:1.3
--- Vanilla/include/sysdefaults.h:1.2	Thu May 10 05:37:11 2001
+++ Vanilla/include/sysdefaults.h	Mon Jul  7 17:19:55 2003
@@ -1,4 +1,4 @@
-/* 	$Id: sysdefaults.h,v 1.2 2001/05/10 10:37:11 quisar Exp $	 */
+/* 	$Id: sysdefaults.h,v 1.3 2003/07/07 22:19:55 ahn Exp $	 */
 
 /* structure for default values that are represented as array of flags */
 struct sysdef_array {
@@ -154,7 +154,11 @@
   { "NEWBIE",	SYSDEF_ROBOT,	(void *) NEWBIE_ROBOT,
     "Enable newbie server robot on startup" },
 #endif
-#if defined(BASEPRACTICE) || defined(NEWBIESERVER)
+#ifdef PRETSERVER
+  { "PRET",	SYSDEF_ROBOT,	(void *) PRET_ROBOT,
+    "Enable pre T entertainment robot on startup" },
+#endif
+#if defined(BASEPRACTICE) || defined(NEWBIESERVER)  || defined(PRETSERVER)
   { "ROBOTHOST",	SYSDEF_CHAR,	robot_host,
     "Robot host" },
 #endif

_______________________________________________
vanilla-devel mailing list
vanilla-devel at us.netrek.org
https://mailman.real-time.com/mailman/listinfo/vanilla-devel