Date: Thursday May 10, 2001 @ 5:37
Author: quisar
Update of /home/netrek/cvsroot/Vanilla/ntserv
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv8235/ntserv
Modified Files:
data.c interface.c
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/ntserv/data.c
diff -u Vanilla/ntserv/data.c:1.17 Vanilla/ntserv/data.c:1.18
--- Vanilla/ntserv/data.c:1.17 Tue May 1 21:00:19 2001
+++ Vanilla/ntserv/data.c Thu May 10 05:37:11 2001
@@ -1,4 +1,4 @@
-/* $Id: data.c,v 1.17 2001/05/02 02:00:19 cameron Exp $
+/* $Id: data.c,v 1.18 2001/05/10 10:37:11 quisar Exp $
*/
#include "copyright.h"
@@ -81,6 +81,8 @@
int dead_warp=0; /* use warp 14 for death detection */
int surrenderStart=1; /* # of planets to start surrender counter */
int sbplanets=5; /* # of planets to get a base */
+int restrict_bomb=1; /* Disallow bombing outside of T-Mode */
+int no_unwarring_bombing=1; /* No 3rd space bombing */
char *shipnames[NUM_TYPES] = {
"Scout", "Destroyer", "Cruiser", "Battleship",
Index: Vanilla/ntserv/interface.c
diff -u Vanilla/ntserv/interface.c:1.9 Vanilla/ntserv/interface.c:1.10
--- Vanilla/ntserv/interface.c:1.9 Fri Feb 2 03:17:52 2001
+++ Vanilla/ntserv/interface.c Thu May 10 05:37:11 2001
@@ -86,12 +86,12 @@
return;
}
-#ifdef RESTRICT_BOMB /* isae - no bombing out of tmode? */
- if (!status->tourn){
- new_warning(UNDEF,"You may not bomb out of T-mode.");
- return;
+ if(restrict_bomb) {
+ if (!status->tourn){
+ new_warning(UNDEF,"You may not bomb out of T-mode.");
+ return;
+ }
}
-#endif /* RESTRICT_BOMB */
if ((!status->tourn) && (bombsOutOfTmode == 0)) {
new_warning(42,"Bomb out of T-mode? Please verify your order to bomb.");
@@ -99,21 +99,22 @@
return;
}
-#ifdef NO_UNWARRING_BOMBING
+ if(no_unwarring_bombing) {
/* Added ability to take back your own planets from 3rd team 11-15-93 ATH */
- if ((status->tourn && realNumShips(owner) < tournplayers)
- && !(me->p_team & planets[me->p_planet].pl_flags)) {
- new_warning(UNDEF,"You may not bomb 3rd and 4th space planets.");
- return;
- }
-#endif
+ if ((status->tourn && realNumShips(owner) < tournplayers)
+ && !(me->p_team & planets[me->p_planet].pl_flags)) {
+ new_warning(UNDEF,"You may not bomb 3rd and 4th space planets.");
+ return;
+ }
+ }
-#ifndef RESTRICT_BOMB
- if ((!status->tourn) && (bombsOutOfTmode == 1)) {
- new_warning(43,"Hoser!");
- bombsOutOfTmode++;
+ if(! restrict_bomb)
+ {
+ if ((!status->tourn) && (bombsOutOfTmode == 1)) {
+ new_warning(43,"Hoser!");
+ bombsOutOfTmode++;
+ }
}
-#endif
if (status->tourn) bombsOutOfTmode = 0;