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 8366a9324283c85cd12b4766bcb1c060fa207160..81cab560ed26ddc5186e975c5d10899b3af5aa79 100644 (file)
--- 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 20ca6e4e0cd74cc025f0a0ad0253520a989e3c3e..b2bd6f0fbf1d4ade4c96024e9b3e5ebe41ec7952 100644 (file)
--- 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)");