Use relations_with() for getrel(getnatp(US), THEM) where US!=THEM

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

diff --git a/src/lib/commands/spy.c b/src/lib/commands/spy.c
index eddce37d748ee74f94466fbe9121986e04aa733c..2a7ec53bd4de1220e01bdc244e08a1b51b460c0a 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-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -129,7 +129,7 @@ spy(void)
                continue;
 
            own = dsect.sct_own;
-           relat = getrel(getnatp(own), player->cnum);
+           relat = relations_with(own, player->cnum);
            if (relat <= NEUTRAL
                && chance(dsect.sct_item[I_MILIT] / 200.0)) {
                /* spy caught */
@@ -182,7 +182,7 @@ spy(void)
 static void
 spy_report(struct sctstr *sp)
 {
-    prxy("%4d,%-4d", sp->sct_x, sp->sct_y, player->cnum);
+    prxy("%4d,%-4d", sp->sct_x, sp->sct_y);
     pr(" %c%c %3d %3d %3d %3d %3d %3d %4d %4d %4d %3d %4d %4d %4d\n",
        dchr[sp->sct_type].d_mnem,
        sp->sct_newtype == sp->sct_type ? ' ' : dchr[sp->sct_newtype].d_mnem,