Update copyright notice

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

diff --git a/src/lib/commands/spy.c b/src/lib/commands/spy.c
index f97830104b9624e6def1f3d0f2a061666763f10e..2adb8ce99eaf8946505973eff94596aef0294412 100644 (file)
--- a/src/lib/commands/spy.c
+++ b/src/lib/commands/spy.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, 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
@@ -29,11 +29,12 @@
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1998-2000
- *     Markus Armbruster, 2005-2011
+ *     Markus Armbruster, 2005-2013
  */
 
 #include <config.h>
 
+#include "chance.h"
 #include "commands.h"
 #include "item.h"
 #include "land.h"
@@ -56,7 +57,7 @@ int
 spy(void)
 {
     natid own;
-    int relat;
+    enum relations relat;
     coord x, y;
     coord nx, ny;
     int military;
@@ -82,7 +83,7 @@ spy(void)
     btucost = (nsects / 40) + 1;
     natp = getnatp(player->cnum);
     if (natp->nat_btu < btucost) {
-       pr("You don't have the BTU's for spying on that scale!\n");
+       pr("You don't have the BTUs for spying on that scale!\n");
        return RET_FAIL;
     }
     bitmap = calloc((WORLD_SZ() + 7) / 8, 1);
@@ -137,18 +138,16 @@ spy(void)
                    pr("Spy deported from %s\n",
                       xyas(nx, ny, player->cnum));
                    if (own != 0)
-                       wu(0, own, "%s (#%d) spy deported from %s\n",
-                          cname(player->cnum), player->cnum,
-                          xyas(nx, ny, own));
+                       wu(0, own, "%s spy deported from %s\n",
+                          prnat(natp), xyas(nx, ny, own));
                } else {
                    /* execute spy */
                    pr("BANG!! A spy was shot in %s\n",
                       xyas(nx, ny, player->cnum));
                    military--;
                    if (own != 0)
-                       wu(0, own, "%s (#%d) spy caught in %s\n",
-                          cname(player->cnum), player->cnum,
-                          xyas(nx, ny, own));
+                       wu(0, own, "%s spy caught in %s\n",
+                          prnat(natp), xyas(nx, ny, own));
                    nreport(player->cnum, N_SPY_SHOT, own, 1);
                }
                if (opt_HIDDEN)
@@ -253,7 +252,7 @@ prplanes(int x, int y)
 static char *
 player_relstr(natid them)
 {
-    int rel = relations_with(player->cnum, them);
+    enum relations rel = relations_with(player->cnum, them);
 
     if (rel == ALLIED)
        return "Allied";