Date: Thursday May 10, 2001 @ 5:37
Author: quisar
Update of /home/netrek/cvsroot/Vanilla/include
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv8235/include
Modified Files:
config.h.in data.h sysdefaults.h
Log Message:
Here's the Changelog entry:
* docs/CUSTOMIZATION, docs/sample_sysdef.in, include/config.h.in,
include/data.h, include/sysdefaults.h, ntserv/data.c,
ntserv/interface.c: remove RESTRICT_BOMB and NO_UNWARRING_BOMBING
from config.h.in and put it in .sysdef.
* tools/xtkill.c: Correct 'S' option to do what it should (put
damages and etemp back to 0.
* Makefile.in: Correct a syntax error.
PS: gum has to be upgraded, but having not the right version of glade, I
send the patch to James Cameron so that he does the checkin.
****************************************
Index: Vanilla/include/config.h.in
diff -u Vanilla/include/config.h.in:1.1 Vanilla/include/config.h.in:1.2
--- Vanilla/include/config.h.in:1.1 Thu May 3 22:33:28 2001
+++ Vanilla/include/config.h.in Thu May 10 05:37:11 2001
@@ -238,9 +238,6 @@
ERIKPLAGUE) */
#undef NO_PLANET_PLAGUE
- /* NO_UNWARRING_BOMBING -No 3rd space bombing */
-#define NO_UNWARRING_BOMBING
-
/* SHOW_RSA - Display the client type
at login */
#define SHOW_RSA
@@ -248,9 +245,6 @@
/* RESETGALAXY - Reset the galaxy after
each conquer */
#define RESETGALAXY
-
- /* RESTRICT_BOMB - No bombing out of t-mode */
-#define RESTRICT_BOMB
/* SELF_RESET - Galaxy will reset if the
daemon dies */
Index: Vanilla/include/data.h
diff -u Vanilla/include/data.h:1.1 Vanilla/include/data.h:1.2
--- Vanilla/include/data.h:1.1 Tue May 1 21:00:19 2001
+++ Vanilla/include/data.h Thu May 10 05:37:11 2001
@@ -1,4 +1,4 @@
-/* $Id: data.h,v 1.1 2001/05/02 02:00:19 cameron Exp $
+/* $Id: data.h,v 1.2 2001/05/10 10:37:11 quisar Exp $
*/
#ifndef _h_data
@@ -125,6 +125,8 @@
extern int dead_warp;
extern int surrenderStart;
extern int sbplanets;
+extern int restrict_bomb;
+extern int no_unwarring_bombing;
#define WP_PLASMA 0
Index: Vanilla/include/sysdefaults.h
diff -u Vanilla/include/sysdefaults.h:1.1 Vanilla/include/sysdefaults.h:1.2
--- Vanilla/include/sysdefaults.h:1.1 Tue May 1 21:00:19 2001
+++ Vanilla/include/sysdefaults.h Thu May 10 05:37:11 2001
@@ -1,4 +1,4 @@
-/* $Id: sysdefaults.h,v 1.1 2001/05/02 02:00:19 cameron Exp $ */
+/* $Id: sysdefaults.h,v 1.2 2001/05/10 10:37:11 quisar Exp $ */
/* structure for default values that are represented as array of flags */
struct sysdef_array {
@@ -188,6 +188,10 @@
"Default client updates per second" },
{ "MINUPDATE", SYSDEF_INT, &maxskip,
"Minimum client updates per second" },
+ { "RESTRICT_BOMB", SYSDEF_INT, &restrict_bomb,
+ "No bombing out of t-mode" },
+ { "NO_UNWARRING_BOMBING", SYSDEF_INT, &no_unwarring_bombing,
+ "No 3rd space bombing" },
{ "", SYSDEF_END, NULL }
};