Change flash not to print "Flash sent" for deities

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

diff --git a/src/lib/commands/flash.c b/src/lib/commands/flash.c
index 9879bc2e0c7926942c779a4bfe1f4571d2dbfee3..e07ea128b8fdf3c1296707486d729082be9bfe96 100644 (file)
--- a/src/lib/commands/flash.c
+++ b/src/lib/commands/flash.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, 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
@@ -26,12 +26,12 @@
  *  ---
  *
  *  flash.c: Flash a message to another player
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2004-2007
+ *     Markus Armbruster, 2004-2009
  */
 
 #include <config.h>
@@ -124,7 +124,7 @@ sendmessage(struct natstr *us, struct natstr *to, char *message, int verbose)
 
     time(&now);
     tm = localtime(&now);
-    for (other = player_next(0); other != 0; other = player_next(other)) {
+    for (other = player_next(NULL); other; other = player_next(other)) {
        if (other->state != PS_PLAYING)
            continue;
        if (to && other->cnum != to->nat_cnum)
@@ -152,13 +152,12 @@ sendmessage(struct natstr *us, struct natstr *to, char *message, int verbose)
                     us->nat_cnam, us->nat_cnum, message);
        sent++;
     }
+    
     if (player->god) {
-       if (to)
-           if (sent)
-               pr("Flash sent to %s\n", to->nat_cnam);
-           else
+       if (to) {
+           if (!sent)
                pr("%s is not logged on\n", to->nat_cnam);
-       else if (sent)
+       } else if (sent)
            pr("Broadcast sent to %d players\n", sent);
        else
            pr("No-one is logged in\n");