Update copyright notice

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

diff --git a/src/lib/commands/look.c b/src/lib/commands/look.c
index ddf6e40152e65eb72cb5e518201ba152d9849a9c..5984b4c4b5f7f64859951b30b515f8a56f74cbfd 100644 (file)
--- a/src/lib/commands/look.c
+++ b/src/lib/commands/look.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,10 +28,12 @@
  *
  *  Known contributors to this file:
  *     Ron Koenderink, 2006-2007
+ *     Markus Armbruster, 2004-2016
  */
 
 #include <config.h>
 
+#include "chance.h"
 #include "commands.h"
 #include "empobj.h"
 #include "map.h"
@@ -119,11 +121,9 @@ void look_at_sect(struct sctstr *sp, int mult)
     int civ, mil;
     int ours = player->god || sp->sct_own == player->cnum;
 
-    if (sp->sct_own == player->cnum)
-       pr("Your ");
-    else
-       pr("%s (#%d) ", cname(sp->sct_own), sp->sct_own);
-    pr("%s", dchr[sp->sct_type].d_name);
+    pr("%s %s",
+       sp->sct_own == player->cnum ? "Your" : prnatid(sp->sct_own),
+       dchr[sp->sct_type].d_name);
     pr(" %d%% efficient ",
        ours ? sp->sct_effic : roundintby(sp->sct_effic, mult));
     civ = sp->sct_item[I_CIVIL];
@@ -193,8 +193,8 @@ look_ship(struct shpstr *lookship)
        /* subs at sea only seen by sonar */
        if (tmcp->m_flags & M_SUB && sect.sct_type == SCT_WATER)
            continue;
-       pr("%s (#%d) %s @ %s\n",
-          cname(sp->shp_own), sp->shp_own, prship(sp),
+       pr("%s %s @ %s\n",
+          prnatid(sp->shp_own), prship(sp),
           xyas(sp->shp_x, sp->shp_y, player->cnum));
        if (opt_HIDDEN)
            setcont(player->cnum, sp->shp_own, FOUND_LOOK);
@@ -222,14 +222,10 @@ 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) {
-           /* If it's on a ship or unit, assume it's hidden
-              enough not to be seen */
-           if (lp->lnd_ship >= 0 || lp->lnd_land >= 0)
-               continue;
            if (!(chance(LND_SPY_DETECT_CHANCE(lp->lnd_effic))))
                continue;
        }
@@ -239,9 +235,9 @@ look_land(struct lndstr *lookland)
        if (dist > vrange)
            continue;
 
-       pr("%s (#%d) %s (approx %d mil) @ %s\n",
-          cname(lp->lnd_own), lp->lnd_own,
-          prland(lp), roundintby(lp->lnd_item[I_MILIT], 20),
+       pr("%s %s (approx %d mil) @ %s\n",
+          prnatid(lp->lnd_own), prland(lp),
+          roundintby(lp->lnd_item[I_MILIT], 20),
           xyas(lp->lnd_x, lp->lnd_y, player->cnum));
        if (opt_HIDDEN)
            setcont(player->cnum, lp->lnd_own, FOUND_LOOK);
@@ -249,7 +245,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;
@@ -259,9 +255,9 @@ look_land(struct lndstr *lookland)
        if (dist > vrange)
            continue;
 
-       pr("%s (#%d) %s @ %s\n",
-          cname(pp->pln_own), pp->pln_own,
-          prplane(pp), xyas(pp->pln_x, pp->pln_y, player->cnum));
+       pr("%s %s @ %s\n",
+          prnatid(pp->pln_own), prplane(pp),
+          xyas(pp->pln_x, pp->pln_y, player->cnum));
        if (opt_HIDDEN)
            setcont(player->cnum, pp->pln_own, FOUND_LOOK);
     }