Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28256/include
Modified Files:
config.h.in data.h defs.h patchlevel.h proto.h struct.h
sysdefaults.h warnings.h
Log Message:
merge 2.11.1 from darcs
Index: config.h.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/config.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config.h.in 26 Apr 2006 09:52:43 -0000 1.6
+++ config.h.in 1 Jun 2006 03:17:24 -0000 1.7
@@ -447,16 +447,6 @@
server. */
#define PLAYER_INDEX
- /* NO_DUPLICATE_HOSTS - prevents two
- pickup players from the same host,
- prevents a player opening an observer
- slot, but does not prevent a player
- slot being opened by an existing
- observer slot. The new client is
- given a wait queue response of
- MAXPLAYERS. Requires FULL_HOSTNAMES. */
-#undef NO_DUPLICATE_HOSTS
-
#endif /* SERVER */
@@ -482,7 +472,8 @@
#define STDC_HEADERS 1 /* 13/01/94 omit hosed index [007] */
#undef HAVE_WAIT3
#undef NEED_SYS_SELECT_H
-#undef NO_FD_SET /* Guess we suck badly if that happens :( */
+ /* Guess we suck badly if that happens :( */
+#undef NO_FD_SET
#undef HAVE_UNISTD_H
#undef HAVE_SYS_TIMEB_H
#undef TM_IN_SYS_TIME
@@ -496,7 +487,8 @@
#undef HAVE_SYS_RESOURCE_H
#undef HAVE_SYS_WAIT_H
#undef HAVE_NETINET_IN_H
-#undef HAVE_SYS_FILIO_H /* Needed for Solaris 2.5.1 */
+ /* Needed for Solaris 2.x */
+#undef HAVE_SYS_FILIO_H
#undef HAVE_GMP2_H
#undef NO_U_INT
#undef SIZEOF_LONG
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/defs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defs.h 26 Apr 2006 09:52:43 -0000 1.7
+++ defs.h 1 Jun 2006 03:17:24 -0000 1.8
@@ -481,4 +481,7 @@
/* #undef PUCK_FIRST 99 */ /* make sure puck runs before players do */
+/* for t-mode messaging, change this according to political environment */
+#define WARMONGER "George Bush"
+
#endif /* _h_defs */
Index: sysdefaults.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/sysdefaults.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sysdefaults.h 26 Apr 2006 09:52:43 -0000 1.3
+++ sysdefaults.h 1 Jun 2006 03:17:24 -0000 1.4
@@ -210,6 +210,8 @@
"Only allow ejection if there is a queue of players" },
{ "EJECT_VOTE_VICIOUS", SYSDEF_INT, &eject_vote_vicious,
"Kill ntserv process to eject, causes some client problems" },
+ { "DUPLICATES", SYSDEF_INT, &duplicates,
+ "Maximum number of duplicate connections from a single IP" },
{ "", SYSDEF_END, NULL }
};
Index: warnings.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/warnings.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- warnings.h 21 Mar 2005 05:23:36 -0000 1.1
+++ warnings.h 1 Jun 2006 03:17:24 -0000 1.2
@@ -137,7 +137,7 @@
/* beam_down() */
"Must be orbiting or docked to beam down.", /* 47 */
"Comm Officer: Starbase refuses permission to beam our troops over.", /* 48 */
-/* declare_war(mask) */
+/* declare_war(mask, refitdelay) */
"Pausing ten seconds to re-program battle computers.", /* 49 */
/* do_refit(type) */
"You must orbit your HOME planet to apply for command reassignment!", /* 50 */
Index: patchlevel.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/patchlevel.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- patchlevel.h 15 May 2006 09:13:18 -0000 1.7
+++ patchlevel.h 1 Jun 2006 03:17:24 -0000 1.8
@@ -12,7 +12,7 @@
* (a) reset this to zero before each major release, and;
* (b) increment this number before each patch release.
*/
-#define PATCHLEVEL 0
+#define PATCHLEVEL 1
#if !defined(NULL)
#define NULL 0
#endif
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/struct.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- struct.h 12 May 2006 03:44:48 -0000 1.9
+++ struct.h 1 Jun 2006 03:17:24 -0000 1.10
@@ -89,7 +89,6 @@
/* The following defines are for gameup field */
#define GU_GAMEOK 1
-#define game_ok ((status->gameup) & GU_GAMEOK)
#define GU_PRACTICE 2
#define practice_mode ((status->gameup) & GU_PRACTICE)
#define GU_CHAOS 4
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/proto.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- proto.h 12 May 2006 03:44:48 -0000 1.9
+++ proto.h 1 Jun 2006 03:17:24 -0000 1.10
@@ -129,7 +129,7 @@
void lock_player(int player);
void tractor_player(int player);
void pressor_player(int player);
-void declare_war(int mask);
+void declare_war(int mask, int refitdelay);
void do_refit(int type);
int numPlanets(int owner);
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/data.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- data.h 12 May 2006 03:44:48 -0000 1.6
+++ data.h 1 Jun 2006 03:17:24 -0000 1.7
@@ -355,5 +355,6 @@
extern int eject_vote_enable;
extern int eject_vote_only_if_queue;
extern int eject_vote_vicious;
+extern int duplicates;
#endif /* _h_data */