License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/expl.c b/src/lib/commands/expl.c
index d85b586d7ede07b27e5792019acf19b6cb7bbb61..125cebac618640eb249968455dc8fab34cfb5830 100644 (file)
--- a/src/lib/commands/expl.c
+++ b/src/lib/commands/expl.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,24 +25,19 @@
  *  ---
  *
  *  expl.c: Take over unoccupied sectors
- * 
+ *
  *  Known contributors to this file:
  *     Jeff Wallace, 1989
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.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(coord curx, coord cury, char *arg);
 
@@ -80,7 +74,7 @@ explore(void)
        pr("You can only explore with civs and mil.\n");
        return RET_FAIL;
     }
-    if ((p = getstarg(player->argp[2], "from sector : ", buf)) == 0)
+    if (!(p = getstarg(player->argp[2], "from sector : ", buf)))
        return RET_SYN;
     if (!sarg_xy(p, &x, &y))
        return RET_SYN;
@@ -115,6 +109,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) {
@@ -122,7 +118,7 @@ explore(void)
        pr("Only exploring with %d.\n", amount);
     }
 
-    if (!want_to_abandon(&sect, vtype, amount, 0)) {
+    if (!want_to_abandon(&sect, vtype, amount, NULL)) {
        pr("Explore cancelled.\n");
        return RET_FAIL;
     }
@@ -130,9 +126,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];
@@ -201,7 +195,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;
@@ -257,7 +251,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;