fire: Suppress bulletin when player shells his own ship

Has always been suppressed for shelling own sectors.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index d9b754d6c0998b72ee9b9df884b1c9e2adb0e4ca..f7a63dcec76a1a58f315be3f94856a166b5eba55 100644 (file)
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2013
+ *     Markus Armbruster, 2004-2014
  */
 
 #include <config.h>
@@ -442,7 +442,7 @@ multifire(void)
            nreport(player->cnum, N_SHP_SHELL, vict, 1);
            /* fall through */
        default:
-           if (vict) {
+           if (vict && vict != player->cnum) {
                wu(0, vict,
                   "Country #%d shelled %s in %s for %d damage.\n",
                   player->cnum, prship(&vship),

diff --git a/tests/fire/journal.log b/tests/fire/journal.log
index 7c4073446ab76a16b227709452e3485920fa5109..9066aa57343203f4b4c3c02ec5c3ff07aa9d898c 100644 (file)
--- a/tests/fire/journal.log
+++ b/tests/fire/journal.log
@@ -279,7 +279,6 @@
     Play#1 output Play#1 1 range is 4.00 (3.50)
     Play#1 output Play#1 1 \007Kaboom!!!
     Play#1 output Play#1 1 Shells hit cs   cargo ship (#9) in 3,1 for 0 damage.
-    Play#1 output Play#1 1 You have a new telegram waiting ...
     Play#1 output Play#1 6 0 603
     Play#1 input fire se 2,0 9
     Play#1 command fire
@@ -289,7 +288,6 @@
     Play#1 output Play#1 1 \007Kaboom!!!
     Play#1 output Play#1 1 Shells hit cs   cargo ship (#9) in 3,1 for 3 damage.
     Play#1 output Play#1 1     cs   cargo ship (#9) takes 2
-    Play#1 output Play#1 1 You have a new telegram waiting ...
     Play#1 output Play#1 6 0 602
     Play#1 input __cmd added 1 1 0
     Play#1 command __cmd
@@ -1376,10 +1374,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input read 1
     Play#0 command read
-    Play#0 output Play#0 1
-    Play#0 output Play#0 1 > BULLETIN from POGO, (#0)  dated Thu Jan  1 00:00:00 1970
-    Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#9) in 3,1 for 0 damage.
-    Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#9) in 3,1 for 3 damage.
+    Play#0 output Play#0 1 No telegrams for 1 at the moment...
     Play#0 output Play#0 6 0 640
     Play#0 input read 2
     Play#0 command read