Update copyright notice

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

diff --git a/src/lib/commands/expl.c b/src/lib/commands/expl.c
index 38e7135df87a43e1361c1f702ce9aec64ba4c889..ce5d5beaf26763d96a98afe210b2b90eb91f3723 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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,36 +19,33 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  expl.c: Take over unoccupied sectors
- * 
+ *
  *  Known contributors to this file:
  *     Jeff Wallace, 1989
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
+#include <config.h>
+
+#include "commands.h"
+#include "game.h"
 #include "item.h"
-#include "file.h"
-#include "nat.h"
+#include "map.h"
 #include "optlist.h"
-#include "commands.h"
+#include "plague.h"
 
-static int explore_map(s_char *what, coord curx, coord cury, s_char *arg);
+static int explore_map(coord curx, coord cury, char *arg);
 
 int
 explore(void)
 {
-    register int amount;
+    int amount;
     struct sctstr sect;
     struct sctstr endsect;
     struct sctstr start;
@@ -65,15 +62,15 @@ explore(void)
     int own, mob;
     int justtook;
     coord x, y;
-    s_char *p;
+    char *p;
     int n;
     int left;
-    s_char buf[1024];
-    s_char prompt[128];
+    char buf[1024];
+    char prompt[128];
 
     if (!(ip = whatitem(player->argp[1], "explore with what? (civ/mil) ")))
        return RET_SYN;
-    vtype = ip->i_vtype;
+    vtype = ip->i_uid;
     if ((vtype != I_CIVIL) && (vtype != I_MILIT)) {
        pr("You can only explore with civs and mil.\n");
        return RET_FAIL;
@@ -93,7 +90,7 @@ explore(void)
        return RET_SYN;
     }
     own = sect.sct_own;
-    mob = (int)sect.sct_mobil;
+    mob = sect.sct_mobil;
     if (vtype == I_CIVIL && sect.sct_oldown != own) {
        pr("You can't explore with conquered populace!\n");
        return RET_SYN;
@@ -113,6 +110,8 @@ explore(void)
     sprintf(prompt, "Number of %s to explore with? (max %d) ",
            ip->i_name, amt_src);
     amount = onearg(player->argp[3], prompt);
+    if (amount <= 0)
+       return RET_SYN;
     if (!check_sect_ok(&sect))
        return RET_FAIL;
     if (amount > amt_src) {
@@ -128,9 +127,7 @@ explore(void)
     if (!check_sect_ok(&sect))
        return RET_FAIL;
 
-    if (amount <= 0)
-       return RET_SYN;
-    weight = amount * ip->i_lbs;
+    weight = (double)amount * ip->i_lbs;
     /* remove commodities from source sector */
     getsect(x, y, &start);
     amt_src = start.sct_item[vtype];
@@ -147,17 +144,20 @@ explore(void)
      * Now parse the path and return ending sector.
      */
     dam = 1;
-    mcost = move_ground((s_char *)ip, &sect, &endsect,
-                       weight, player->argp[4],
+    mcost = move_ground(&sect, &endsect, weight, player->argp[4],
                        explore_map, 1, &dam);
 
     if (dam) {
        left = effdamage(amount, dam);
        if (left < amount) {
            if (left) {
-               pr("%d of the %s you were exploring with were destroyed!\nOnly %d %s made it to %s\n", amount - left, ip->i_name, left, ip->i_name, xyas(endsect.sct_x, endsect.sct_y, player->cnum));
+               pr("%d of the %s you were exploring with were destroyed!\n"
+                  "Only %d %s made it to %s\n",
+                  amount - left, ip->i_name, left, ip->i_name,
+                  xyas(endsect.sct_x, endsect.sct_y, player->cnum));
            } else {
-               pr("All of the %s you were exploring with were destroyed!\n", ip->i_name);
+               pr("All of the %s you were exploring with were destroyed!\n",
+                  ip->i_name);
            }
            amount = left;
        }
@@ -170,14 +170,14 @@ explore(void)
     if (mcost < 0) {
        pr("\nExplore aborted");
        getsect(start.sct_x, start.sct_y, &sect);
-       sect.sct_mobil = (u_char)mob;
+       sect.sct_mobil = mob;
     } else {
        /* Charge mobility */
        getsect(sect.sct_x, sect.sct_y, &sect);
        n = sect.sct_mobil - mcost;
        if (n < 0)
            n = 0;
-       sect.sct_mobil = (u_char)n;
+       sect.sct_mobil = n;
        pr(", %d mob left in %s", sect.sct_mobil,
           xyas(sect.sct_x, sect.sct_y, player->cnum));
        putsect(&sect);
@@ -196,7 +196,7 @@ explore(void)
        putsect(&sect);
        return RET_FAIL;
     }
-    if (chksect.sct_type == '.') {
+    if (chksect.sct_type == SCT_WATER) {
        pr("Bridge disappeared!\n");
        getsect(start.sct_x, start.sct_y, &start);
        start.sct_flags &= ~MOVE_IN_PROGRESS;
@@ -252,7 +252,7 @@ explore(void)
        pr("Sector %s is now yours.\n",
           xyas(sect.sct_x, sect.sct_y, player->cnum));
        if (opt_MOB_ACCESS) {
-           time(&sect.sct_access);
+           game_tick_to_now(&sect.sct_access);
            sect.sct_mobil = -(etu_per_update / sect_mob_neg_factor);
        } else {
            sect.sct_mobil = 0;
@@ -275,26 +275,18 @@ explore(void)
 
 /*ARGSUSED*/
 static int
-explore_map(s_char *what, coord curx, coord cury, s_char *arg)
+explore_map(coord curx, coord cury, char *arg)
 {
     struct nstr_sect ns;
-    struct natstr *np;
     struct sctstr sect;
-    coord rel_x, rel_y;
-    s_char range[128];
-    s_char view[7];
+    char view[7];
     int i;
     int changed = 0;
 
-    np = getnatp(player->cnum);
-    rel_x = xrel(np, curx);
-    rel_y = yrel(np, cury);
-    sprintf(range, "%d:%d,%d:%d", rel_x - 2, rel_x + 2, rel_y - 1,
-           rel_y + 1);
-    if (!snxtsct(&ns, range))
-       return RET_FAIL;
+    snxtsct_dist(&ns, curx, cury, 1);
     i = 0;
     while (i < 7 && nxtsct(&ns, &sect)) {
+       /* Nasty: this relies on the iteration order */
        view[i] = dchr[sect.sct_type].d_mnem;
        switch (sect.sct_type) {
        case SCT_WATER: