Permit flash to yourself

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

diff --git a/src/lib/commands/flash.c b/src/lib/commands/flash.c
index 10655161d27e3c6829c17a094989c1aa1621a4d9..ffdba7a517a733d7a2c2a6a0d7db8ea10e1a5b42 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-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
@@ -31,15 +31,15 @@
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2004-2007
+ *     Markus Armbruster, 2004-2009
  */
 
 #include <config.h>
 
 #include "commands.h"
 
-static int chat(struct natstr *, struct natstr *, char *);
-static int sendmessage(struct natstr *, struct natstr *, char *, int);
+static int chat(struct natstr *, char *);
+static int sendmessage(struct natstr *, char *, int);
 
 int
 flash(void)
@@ -63,19 +63,20 @@ 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 && tocn != player->cnum
+           && getrel(to, player->cnum) < FRIENDLY) {
            pr("%s is not a deity or friendly with us.\n", to->nat_cnam);
            return RET_SYN;
        }
     }
 
-    return chat(us, to, player->comtail[2]);
+    return chat(to, player->comtail[2]);
 }
 
 int
 wall(void)
 {
-    return chat(getnatp(player->cnum), NULL, player->comtail[1]);
+    return chat(NULL, player->comtail[1]);
 }
 
 /*
@@ -85,7 +86,7 @@ wall(void)
  * Return RET_OK.
  */
 static int
-chat(struct natstr *us, struct natstr *to, char *message)
+chat(struct natstr *to, char *message)
 {
     char buf[1024];            /* UTF-8 */
 
@@ -93,15 +94,15 @@ chat(struct natstr *us, struct natstr *to, char *message)
        buf[0] = ':';
        buf[1] = ' ';
        strcpy(buf+2, message);
-       sendmessage(us, to, buf, 1);
+       sendmessage(to, buf, 1);
     } else {
-       sendmessage(us, to, "...", 1);
+       sendmessage(to, "...", 1);
        while (ugetstring("> ", buf)) {
            if (*buf == '.')
                break;
-           sendmessage(us, to, buf, 0);
+           sendmessage(to, buf, 0);
        }
-       sendmessage(us, to, "<EOT>", 0);
+       sendmessage(to, "<EOT>", 0);
     }
     return RET_OK;
 }
@@ -114,12 +115,12 @@ chat(struct natstr *us, struct natstr *to, char *message)
  * verbose if VERBOSE.
  */
 static int
-sendmessage(struct natstr *us, struct natstr *to, char *message, int verbose)
+sendmessage(struct natstr *to, char *message, int verbose)
 {
     struct player *other;
     struct tm *tm;
     time_t now;
-    int sent = 0;
+    int sent = 0, rejected = 0;
     struct natstr *wto;
 
     time(&now);
@@ -127,50 +128,60 @@ sendmessage(struct natstr *us, struct natstr *to, char *message, int verbose)
     for (other = player_next(NULL); other; other = player_next(other)) {
        if (other->state != PS_PLAYING)
            continue;
-       if (to && other->cnum != to->nat_cnum)
-           continue;
-       if (!(wto = getnatp(other->cnum)))
-           continue;
-       if (!to && !player->god && getrel(wto, player->cnum) != ALLIED)
-           continue;
-       if (!player->god && !(wto->nat_flags & NF_FLASH))
-           continue;
-       if (player == other)
+       if (to) {
+           /* flash */
+           if (other->cnum != to->nat_cnum)
+               continue;
+           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)
+               continue;
+       }
+       if (!player->god && !(wto->nat_flags & NF_FLASH)) {
+           rejected++;
            continue;
+       }
+
        if (verbose)
            if (to)
                pr_flash(other, "FLASH from %s (#%d) @ %02d:%02d%s\n",
-                        us->nat_cnam, us->nat_cnum, tm->tm_hour,
+                        cname(player->cnum), player->cnum, tm->tm_hour,
                         tm->tm_min, message);
            else
                pr_flash(other, "BROADCAST from %s (#%d) @ %02d:%02d%s\n",
-                        us->nat_cnam, us->nat_cnum, tm->tm_hour,
+                        cname(player->cnum), player->cnum, tm->tm_hour,
                         tm->tm_min, message);
 
        else
            pr_flash(other, "%s (#%d): %s\n",
-                    us->nat_cnam, us->nat_cnum, message);
+                    cname(player->cnum), player->cnum, message);
        sent++;
     }
-    if (player->god) {
-       if (to)
-           if (sent)
-               pr("Flash sent to %s\n", to->nat_cnam);
-           else
-               pr("%s is not logged on\n", to->nat_cnam);
-       else if (sent)
-           pr("Broadcast sent to %d players\n", sent);
-       else
-           pr("No-one is logged in\n");
-    }
-    if (to && !player->god) {
-       /* If they are allied with us, we would normally see that
-        * they are logged in anyway, so just tell us */
-       if ((getrel(to, player->cnum) == ALLIED) && !sent) {
-           if (to->nat_flags & NF_FLASH)
+
+    if (to) {
+       /* flash */
+       if (player->god || to->nat_cnum == player->cnum
+           || getrel(to, 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);
+           else if (!sent) {
                pr("%s is not logged on\n", to->nat_cnam);
+           }
+       }
+    } else {
+       /* wall */
+       if (player->god) {
+           if (sent)
+               pr("Broadcast sent to %d players\n", sent);
            else
-               pr("%s is not accepting flashes\n", to->nat_cnam);
+               pr("No-one is logged in\n");
        }
     }
     return 0;