Avoid repeated hours and game down status notifications

[empserver] / src / lib / player / empdis.c

diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c
index eabb5be68c99e4064533829fea100d6119acfdc7..b2bdff77c949c893db19e44f60ed727c56a1576b 100644 (file)
--- a/src/lib/player/empdis.c
+++ b/src/lib/player/empdis.c
@@ -231,27 +231,33 @@ enforce_minimum_session_time(void)
 }
 
 int
-may_play_now(struct natstr *natp, time_t now,
-            int suppress_deity_message)
+may_play_now(struct natstr *natp, time_t now)
 {
     if (CANT_HAPPEN(natp->nat_cnum != player->cnum))
        return 0;
 
-    if (!gamehours(now)) {
-       if (natp->nat_stat != STAT_GOD || !suppress_deity_message)
-           pr("Empire hours restriction in force\n");
+    if (gamehours(now)) {
+       if (player->flags & PF_HOURS) {
+           pr("\nEmpire hours restriction lifted\n");
+           player->flags &= ~PF_HOURS;
+       }
+    } else {
+       if (!(player->flags & PF_HOURS)) {
+           pr("\nEmpire hours restriction in force\n");
+           player->flags |= PF_HOURS;
+       }
        if (natp->nat_stat != STAT_GOD)
            return 0;
     }
 
     if (game_play_disabled()) {
-       if (natp->nat_stat != STAT_GOD) {
+       if (!(player->flags & PF_DOWN)) {
            show_first_tel(downfil);
            pr("\nThe game is down\n");
-           return 0;
+           player->flags |= PF_DOWN;
        }
-       if (!suppress_deity_message)
-           pr("The game is down\n");
+       if (natp->nat_stat != STAT_GOD)
+           return 0;
     }
 
     if ((natp->nat_stat != STAT_GOD && natp->nat_stat != STAT_VIS)