Update copyright notice.

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

diff --git a/src/lib/commands/expl.c b/src/lib/commands/expl.c
index a4dc589c6f07dbda12ee2e3827d54c3828523383..af1ab6b7885eab394a7fd42c3502da012e9a4c73 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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -71,11 +71,10 @@ explore(void)
     s_char buf[1024];
     s_char prompt[128];
 
-    if ((ip =
-        whatitem(player->argp[1], "explore with what? (civ/mil) ")) == 0)
+    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;
     }
@@ -95,7 +94,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;
     }
@@ -104,15 +103,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);
@@ -193,6 +190,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);
@@ -218,10 +221,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) {
@@ -232,9 +235,6 @@ explore(void)
            return RET_FAIL;
        }
     }
-    getsect(start.sct_x, start.sct_y, &start);
-    start.sct_flags &= ~MOVE_IN_PROGRESS;
-    putsect(&start);
     amt_dst = sect.sct_item[vtype];
     if (amount > ITEM_MAX - amt_dst) {
        amount = ITEM_MAX - amt_dst;
@@ -260,22 +260,16 @@ explore(void)
     }
     if (infected && sect.sct_pstage == PLG_HEALTHY)
        sect.sct_pstage = PLG_EXPOSED;
-    if (vtype == V_CIVIL) {
-       if (opt_NEW_WORK) {
-           sect.sct_loyal = ((amt_dst * sect.sct_loyal) +
-                             (amount * loyal)) / (amt_dst + amount);
-           sect.sct_work = ((amt_dst * sect.sct_work) +
-                            (amount * work)) / (amt_dst + amount);
-       } else {                /* ! NEW_WORK */
-
-           /* It only takes one bad apple... */
-           if (sect.sct_loyal < loyal)
-               sect.sct_loyal = loyal;
-           if (sect.sct_work > work)
-               sect.sct_work = work;
-       }                       /* end NEW_WORK */
+    if (vtype == I_CIVIL) {
+       sect.sct_loyal
+           = (amt_dst * sect.sct_loyal + amount * loyal) / (amt_dst + amount);
+       sect.sct_work
+           = (amt_dst * sect.sct_work + amount * work) / (amt_dst + amount);
     }
     putsect(&sect);
+    getsect(start.sct_x, start.sct_y, &start);
+    start.sct_flags &= ~MOVE_IN_PROGRESS;
+    putsect(&start);
     return RET_OK;
 }