COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / commands / expl.c

diff --git a/src/lib/commands/expl.c b/src/lib/commands/expl.c
index 40c332c70ffb29512498376c5a72a810a8b95528..b2a42cbb0b266fdba38eb811ac64efc541e16c5a 100644 (file)
--- a/src/lib/commands/expl.c
+++ b/src/lib/commands/expl.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -31,9 +31,11 @@
  *     Jeff Wallace, 1989
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
@@ -48,7 +50,7 @@ static int explore_map(s_char *what, coord curx, coord cury, s_char *arg);
 int
 explore(void)
 {
-    register int amount;
+    int amount;
     struct sctstr sect;
     struct sctstr endsect;
     struct sctstr start;
@@ -56,7 +58,7 @@ explore(void)
     double weight;
     int mcost, dam;
     int infected;
-    int vtype;
+    i_type vtype;
     int amt_src;
     int amt_dst;
     struct ichrstr *ip;
@@ -74,7 +76,7 @@ explore(void)
     if (!(ip = whatitem(player->argp[1], "explore with what? (civ/mil) ")))
        return RET_SYN;
     vtype = ip->i_vtype;
-    if ((vtype != V_CIVIL) && (vtype != V_MILIT)) {
+    if ((vtype != I_CIVIL) && (vtype != I_MILIT)) {
        pr("You can only explore with civs and mil.\n");
        return RET_FAIL;
     }
@@ -94,7 +96,7 @@ explore(void)
     }
     own = sect.sct_own;
     mob = (int)sect.sct_mobil;
-    if (vtype == V_CIVIL && sect.sct_oldown != own) {
+    if (vtype == I_CIVIL && sect.sct_oldown != own) {
        pr("You can't explore with conquered populace!\n");
        return RET_SYN;
     }
@@ -103,15 +105,13 @@ explore(void)
           xyas(sect.sct_x, sect.sct_y, player->cnum));
        return RET_SYN;
     }
-    if (vtype == V_CIVIL) {
-       work = sect.sct_work;
-       if (work != 100)
-           pr("Warning: civil unrest\n");
-       loyal = sect.sct_loyal;
-    } else if (vtype == V_MILIT) {
-       work = 100;
-       loyal = 0;
-    }
+
+    /* only used when moving civs; but prevent spurious compiler warnings */
+    work = sect.sct_work;
+    loyal = sect.sct_loyal;
+    if (vtype == I_CIVIL && work != 100)
+       pr("Warning: civil unrest\n");
+
     sprintf(prompt, "Number of %s to explore with? (max %d) ",
            ip->i_name, amt_src);
     amount = onearg(player->argp[3], prompt);
@@ -192,6 +192,12 @@ explore(void)
      *      Check for a multitude of problems
      */
     getsect(endsect.sct_x, endsect.sct_y, &chksect);
+    if (amount <= 0) {
+       getsect(start.sct_x, start.sct_y, &start);
+       sect.sct_flags &= ~MOVE_IN_PROGRESS;
+       putsect(&sect);
+       return RET_FAIL;
+    }
     if (chksect.sct_type == '.') {
        pr("Bridge disappeared!\n");
        getsect(start.sct_x, start.sct_y, &start);
@@ -217,10 +223,10 @@ explore(void)
        takeover(&sect, player->cnum);
        justtook = 1;
        sect.sct_oldown = own;
-       sect.sct_work = work;
-       sect.sct_loyal = loyal;
+       sect.sct_work = 100;
+       sect.sct_loyal = 0;
     }
-    if (vtype == V_CIVIL && sect.sct_oldown != player->cnum) {
+    if (vtype == I_CIVIL && sect.sct_oldown != player->cnum) {
        pr("Your civilians don't want to stay!\n");
        getsect(start.sct_x, start.sct_y, &sect);
        if (sect.sct_own != own) {
@@ -256,7 +262,7 @@ explore(void)
     }
     if (infected && sect.sct_pstage == PLG_HEALTHY)
        sect.sct_pstage = PLG_EXPOSED;
-    if (vtype == V_CIVIL) {
+    if (vtype == I_CIVIL) {
        sect.sct_loyal
            = (amt_dst * sect.sct_loyal + amount * loyal) / (amt_dst + amount);
        sect.sct_work