Move declarations for chance.c to new chance.h

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

diff --git a/src/lib/commands/look.c b/src/lib/commands/look.c
index 493d7826c674b33d4380f9d2125b4970277038b2..d5d2d66834c73b983bc73197a7f05f44a1074f51 100644 (file)
--- a/src/lib/commands/look.c
+++ b/src/lib/commands/look.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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/>.
  *
  *  ---
  *
@@ -33,6 +32,7 @@
 
 #include <config.h>
 
+#include "chance.h"
 #include "commands.h"
 #include "empobj.h"
 #include "map.h"
@@ -70,7 +70,7 @@ do_look(int type)
 
     if (!snxtitem(&ni, type, player->argp[1], NULL))
        return RET_SYN;
-    bitmap = calloc(WORLD_SZ() / 8, 1);
+    bitmap = calloc((WORLD_SZ() + 7) / 8, 1);
     if (!bitmap) {
        logerror("malloc failed in do_look\n");
        pr("Memory error.  Tell the deity.\n");
@@ -223,7 +223,7 @@ look_land(struct lndstr *lookland)
     for (i = 0; NULL != (lp = getlandp(i)); i++) {
        if (lp->lnd_own == player->cnum || lp->lnd_own == 0)
            continue;
-       if (lp->lnd_ship >= 0)
+       if (lp->lnd_ship >= 0 || lp->lnd_land >= 0)
            continue;
        /* Don't always see spies */
        if (lchr[(int)lp->lnd_type].l_flags & L_SPY) {
@@ -250,7 +250,7 @@ look_land(struct lndstr *lookland)
     for (i = 0; NULL != (pp = getplanep(i)); i++) {
        if (pp->pln_own == player->cnum || pp->pln_own == 0)
            continue;
-       if (pp->pln_ship >= 0)
+       if (pp->pln_ship >= 0 || pp->pln_land >= 0)
            continue;
        if (pp->pln_flags & PLN_LAUNCHED)
            continue;