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 4666d179ed7465ad20cc960623c775cb66471ac3..030fe0e5c7c59c1202c642fd3b2a7ceef228887b 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -29,8 +29,8 @@
  *
  *  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>
@@ -70,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
@@ -121,11 +121,11 @@ command(void)
     time_t now;
 
     if (getcommand(player->combuf) < 0)
-       return 0;
+       return player->aborted;
 
     now = time(NULL);
     update_timeused(now);
-    if (!may_play_now(getnatp(player->cnum), now, 1))
+    if (!player->god && !may_play_now(getnatp(player->cnum), now))
        return 0;
 
     if (parse(player->combuf, scanspace, player->argp, player->comtail,
@@ -173,7 +173,7 @@ status(void)
 
     time(&player->curup);
     update_timeused(player->curup);
-    if (!may_play_now(natp, player->curup, 0))
+    if (!may_play_now(natp, player->curup))
        return 0;
     if (player->btused) {
        natp->nat_btu -= player->btused;