Don't log out player when he interrupts a command

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

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 7c47e72769e18131b5a2a26991430842904534f5..030fe0e5c7c59c1202c642fd3b2a7ceef228887b 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -29,14 +29,12 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2008
- *     Ron Koenderink, 2004-2007
+ *     Markus Armbruster, 2004-2009
+ *     Ron Koenderink, 2004-2009
  */
 
 #include <config.h>
 
-#include <errno.h>
-#include <stdio.h>
 #include "com.h"
 #include "empio.h"
 #include "empthread.h"
@@ -72,7 +70,7 @@ player_main(struct player *p)
        return;
     }
     natp = getnatp(player->cnum);
-    if (!may_play_now(natp, player->curup, 0))
+    if (!may_play_now(natp, player->curup))
        return;
     if (natp->nat_stat != STAT_VIS
        && natp->nat_last_login
@@ -120,11 +118,14 @@ command(void)
 {
     char *redir;               /* UTF-8 */
     char scanspace[1024];
+    time_t now;
 
     if (getcommand(player->combuf) < 0)
-       return 0;
+       return player->aborted;
 
-    if (!may_play_now(getnatp(player->cnum), time(NULL), 1))
+    now = time(NULL);
+    update_timeused(now);
+    if (!player->god && !may_play_now(getnatp(player->cnum), now))
        return 0;
 
     if (parse(player->combuf, scanspace, player->argp, player->comtail,
@@ -171,7 +172,8 @@ status(void)
        pr("You are no longer broke!\n");
 
     time(&player->curup);
-    if (!may_play_now(natp, player->curup, 0))
+    update_timeused(player->curup);
+    if (!may_play_now(natp, player->curup))
        return 0;
     if (player->btused) {
        natp->nat_btu -= player->btused;
@@ -253,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;
 }