Update copyright notice

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

diff --git a/src/lib/commands/spy.c b/src/lib/commands/spy.c
index b746b3d67a7fdf1cfbe52e0742527629b02dc74a..a5869a47326e090d02bf1ec37dedf7aafec97300 100644 (file)
--- a/src/lib/commands/spy.c
+++ b/src/lib/commands/spy.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-2014, 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/>.
  *
  *  ---
  *
@@ -30,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"
@@ -138,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)