Update copyright notice

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

diff --git a/src/lib/commands/flash.c b/src/lib/commands/flash.c
index d1aaa2d097733bec1b0c85dbd15329df8de6e8f2..f79f5948f982703c64484d7d39a96a2495ef5ce4 100644 (file)
--- a/src/lib/commands/flash.c
+++ b/src/lib/commands/flash.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-2012, 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/>.
  *
  *  ---
  *
@@ -31,7 +30,7 @@
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2004-2009
+ *     Markus Armbruster, 2004-2011
  */
 
 #include <config.h>
@@ -63,7 +62,8 @@ flash(void)
        }
     } else {
        /* Ok, we are a normal country, can we flash them? */
-       if (to->nat_stat != STAT_GOD && getrel(to, player->cnum) < FRIENDLY) {
+       if (to->nat_stat != STAT_GOD
+           && relations_with(tocn, player->cnum) < FRIENDLY) {
            pr("%s is not a deity or friendly with us.\n", to->nat_cnam);
            return RET_SYN;
        }
@@ -127,8 +127,6 @@ sendmessage(struct natstr *to, char *message, int verbose)
     for (other = player_next(NULL); other; other = player_next(other)) {
        if (other->state != PS_PLAYING)
            continue;
-       if (player == other)
-           continue;
        if (to) {
            /* flash */
            if (other->cnum != to->nat_cnum)
@@ -136,10 +134,13 @@ sendmessage(struct natstr *to, char *message, int verbose)
            wto = to;
        } else {
            /* wall */
+           if (player == other)
+               continue;
            wto = getnatp(other->cnum);
            if (CANT_HAPPEN(!wto))
                continue;
-           if (!player->god && getrel(wto, player->cnum) != ALLIED)
+           if (!player->god
+               && relations_with(other->cnum, player->cnum) != ALLIED)
                continue;
        }
        if (!player->god && !(wto->nat_flags & NF_FLASH)) {
@@ -165,7 +166,8 @@ sendmessage(struct natstr *to, char *message, int verbose)
 
     if (to) {
        /* flash */
-       if (player->god || getrel(to, player->cnum) == ALLIED) {
+       if (player->god
+           || relations_with(to->nat_cnum, player->cnum) == ALLIED) {
            /* Can see TO logged in anyway, so it's okay to tell */
            if (rejected)
                pr("%s is not accepting flashes\n", to->nat_cnam);