Simplify checks whether player thread may sleep

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

diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c
index 5d5454ba8987292a616e4d93ff5edb38c370c9b3..a75fda28d959632818cc600933366a6cb599527a 100644 (file)
--- a/src/lib/player/dispatch.c
+++ b/src/lib/player/dispatch.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, 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
@@ -19,39 +19,39 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  dispatch.c: Actually execute the command given
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2007
  */
 
-#include "prototypes.h"
-#include "misc.h"
-#include "player.h"
+#include <config.h>
+
 #include "com.h"
+#include "empio.h"
+#include "file.h"
 #include "match.h"
+#include "misc.h"
 #include "nat.h"
-#include "file.h"
-#include "proto.h"
-#include "empio.h"
 #include "optlist.h"
-#include "subs.h"
-#include "common.h"
+#include "player.h"
+#include "proto.h"
+#include "prototypes.h"
 #include "server.h"
 
 /*
  * Execute command named by player->argp[0].
- * BUF is the raw command line (user text).  It should have been
- * passed to parse() to set up player->argp.
- * If REDIR is not null, it's the command's redirection; it is user
- * text.
+ * BUF is the raw UTF-8 command line.  It should have been passed to
+ * parse() to set up player->argp.
+ * If REDIR is not null, it's the command's redirection, in UTF-8.
  * Return -1 if the command is not unique or doesn't exist, else 0.
  */
 int
@@ -61,19 +61,14 @@ dispatch(char *buf, char *redir)
     struct cmndstr *command;
     int cmd;
 
-    cmd = comtch(player->argp[0], player_coms,
-                player->ncomstat, player->god);
+    cmd = comtch(player->argp[0], player_coms, player->nstat);
     if (cmd < 0) {
        if (cmd == M_NOTUNIQUE)
            pr("Command \"%s\" is ambiguous -- ", player->argp[0]);
        else if (cmd == M_IGNORE)
            return 0;
-       else {
-           pr("\"%s\" is not a legal command ", player->argp[0]);
-           if (player->nstat != player->ncomstat)
-               pr("now ");
-           pr("\n");
-       }
+       else
+           pr("\"%s\" is not a legal command\n", player->argp[0]);
        return -1;
     }
     command = &player_coms[cmd];
@@ -86,20 +81,19 @@ dispatch(char *buf, char *redir)
            return 0;
        }
     }
-    if (command->c_addr == 0) {
+    if (!command->c_addr) {
        pr("Command not implemented\n");
        return 0;
     }
-    if (update_pending) {
-       pr("Update in progress...command failed\n");
-       return 0;
-    }
+    player->may_sleep = command->c_flags & C_MOD
+       ? PLAYER_SLEEP_ON_INPUT : PLAYER_SLEEP_FREELY;
+    player->command = command;
+    empth_rwlock_rdlock(play_lock);
     if (redir) {
        prredir(redir);
        uprnf(buf);
        pr("\n");
     }
-    player->command = command;
     switch (command->c_addr()) {
     case RET_OK:
        player->btused += command->c_cost;
@@ -112,9 +106,11 @@ dispatch(char *buf, char *redir)
        pr("Usage: %s\n", command->c_form);
        break;
     default:
-       logerror("%s: returned bad value", command->c_form);
+       CANT_REACH();
        break;
     }
-    player->command = 0;
+    empth_rwlock_unlock(play_lock);
+    player->command = NULL;
+    player->may_sleep = PLAYER_SLEEP_FREELY;
     return 0;
 }