Update copyright notice

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

diff --git a/src/lib/commands/expl.c b/src/lib/commands/expl.c
index d85b586d7ede07b27e5792019acf19b6cb7bbb61..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-2006, 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
@@ -26,24 +26,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);
 
@@ -115,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) {
@@ -130,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];
@@ -201,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;
@@ -257,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;