From: Pasi Kallinen <paxed@alt.org>
Date: Sun, 6 Apr 2008 09:36:20 +0000 (+0000)
Subject: Don't show the "press 'm' to mail user" in watching screen unless spool is enabled.
X-Git-Tag: v1.6.1-roc-dev~266
X-Git-Url: https://skyeroc.xyz/gitweb/?a=commitdiff_plain;h=6cf3c008bcde1903cb9a67ad71ed4787e21a8ec0;p=dgamelaunch

Don't show the "press 'm' to mail user" in watching screen unless spool is enabled.


git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@442 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
---

diff --git a/TODO b/TODO
index 8366a93..81cab56 100644
--- a/TODO
+++ b/TODO
@@ -13,8 +13,6 @@
  include unicode stripping from crawl dgl, etc)
 -public (no-password) accounts? (a per-user flag) what happens when someone
  is playing on the account and someone else logins and we start playing?
--change the watching screen not to show the 'press 'm' to mail user'
- part, if spool isn't enabled.
 -info screen (more than just the banner), for info about the game(s)
  and the server, etc.
 -allow more than one editor per dgl
diff --git a/dgamelaunch.c b/dgamelaunch.c
index 20ca6e4..b2bd6f0 100644
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -381,7 +381,8 @@ inprogressmenu (int gameid)
       erase ();
       drawbanner (&banner, 1, 1);
       mvprintw (3, 1,
-                "During playback, hit 'q' to return here, 'm' to send mail (requires login),");
+		"During playback, hit 'q' to return here,%s",
+		(((gameid == -1) || (myconfig[gameid]->spool)) ? " 'm' to send mail (requires login)," : ""));
       mvaddstr (4, 1,
                 "'s' to toggle graphic-set stripping for DEC, IBM, and none (default).");
       mvaddstr (5, 1, "The following games are in progress: (use uppercase to try to change size)");