Move show_first_tel() from player.c to rea.c

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

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index c218f3559fb65b326fbe55a99352735840bb2e59..4666d179ed7465ad20cc960623c775cb66471ac3 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -35,8 +35,6 @@
 
 #include <config.h>
 
-#include <errno.h>
-#include <stdio.h>
 #include "com.h"
 #include "empio.h"
 #include "empthread.h"
@@ -72,16 +70,8 @@ player_main(struct player *p)
        return;
     }
     natp = getnatp(player->cnum);
-    if (!gamehours(player->curup)) {
-       pr("Empire hours restriction in force\n");
-       if (natp->nat_stat != STAT_GOD)
-           return;
-    }
-    if ((natp->nat_stat == STAT_ACTIVE || natp->nat_stat == STAT_SANCT)
-       && natp->nat_timeused > m_m_p_d * 60) {
-       pr("Max minutes per day limit exceeded.\n");
+    if (!may_play_now(natp, player->curup, 0))
        return;
-    }
     if (natp->nat_stat != STAT_VIS
        && natp->nat_last_login
        && (strcmp(natp->nat_hostaddr, player->hostaddr)
@@ -129,24 +119,14 @@ command(void)
     char *redir;               /* UTF-8 */
     char scanspace[1024];
     time_t now;
-    struct natstr *natp;
 
     if (getcommand(player->combuf) < 0)
        return 0;
 
     now = time(NULL);
     update_timeused(now);
-    natp = getnatp(player->cnum);
-    if (!gamehours(player->curup))
-       if (natp->nat_stat != STAT_GOD) {
-           pr("Empire hours restriction in force\n");
-           return 0;
-       }
-    if ((natp->nat_stat == STAT_ACTIVE || natp->nat_stat == STAT_SANCT)
-       && natp->nat_timeused > m_m_p_d * 60) {
-       pr("Max minutes per day limit exceeded.\n");
+    if (!may_play_now(getnatp(player->cnum), now, 1))
        return 0;
-    }
 
     if (parse(player->combuf, scanspace, player->argp, player->comtail,
              &player->condarg, &redir) < 0) {
@@ -193,16 +173,8 @@ status(void)
 
     time(&player->curup);
     update_timeused(player->curup);
-    if (!gamehours(player->curup)) {
-       pr("Empire hours restriction in force\n");
-       if (natp->nat_stat != STAT_GOD)
-           return 0;
-    }
-    if ((natp->nat_stat == STAT_ACTIVE || natp->nat_stat == STAT_SANCT)
-       && natp->nat_timeused > m_m_p_d * 60) {
-       pr("Max minutes per day limit exceeded.\n");
+    if (!may_play_now(natp, player->curup, 0))
        return 0;
-    }
     if (player->btused) {
        natp->nat_btu -= player->btused;
        player->btused = 0;
@@ -228,10 +200,6 @@ status(void)
     if (natp->nat_stat == STAT_ACTIVE && (player->nstat & CAP) == 0)
        pr("You lost your capital... better designate one (see info capital)\n");
     putnat(natp);
-    if (gamedown() && !player->god) {
-       pr("gamedown\n");
-       return 0;
-    }
     return 1;
 }
 
@@ -287,37 +255,7 @@ execute(void)
 int
 show_motd(void)
 {
-    FILE *motd_fp;
-    struct telstr tgm;
-    char buf[MAXTELSIZE + 1];  /* UTF-8 */
-
-    if ((motd_fp = fopen(motdfil, "rb")) == NULL) {
-       if (errno == ENOENT)
-           return RET_OK;
-       else {
-           pr ("Could not open motd.\n");
-           logerror("Could not open motd (%s).\n", motdfil);
-           return RET_FAIL;
-       }
-    }
-    if (fread(&tgm, sizeof(tgm), 1, motd_fp) != 1) {
-       logerror("bad header on login message (motdfil)");
-       fclose(motd_fp);
-       return RET_FAIL;
-    }
-    if (tgm.tel_length >= (long)sizeof(buf)) {
-       logerror("text length (%ld) is too long for login message (motdfil)", tgm.tel_length);
-       fclose(motd_fp);
-       return RET_FAIL;
-    }
-    if (fread(buf, tgm.tel_length, 1, motd_fp) != 1) {
-       logerror("bad length %ld on login message", tgm.tel_length);
-       fclose(motd_fp);
-       return RET_FAIL;
-    }
-    buf[tgm.tel_length] = 0;
-    uprnf(buf);
-    fclose(motd_fp);
+    show_first_tel(motdfil);
     return RET_OK;
 }