Update copyright notice

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

diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c
index 967a58d19592a4626a12fd4592f20023638c531d..f629f5d383a42a09f2b481e60977bc4eb08467ae 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-2007, 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
@@ -26,10 +26,11 @@
  *  ---
  *
  *  dispatch.c: Actually execute the command given
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2007
  */
 
 #include <config.h>
@@ -60,18 +61,14 @@ dispatch(char *buf, char *redir)
     struct cmndstr *command;
     int cmd;
 
-    cmd = comtch(player->argp[0], player_coms, player->ncomstat);
+    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];
@@ -117,7 +114,7 @@ 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;
     }
     empth_rwlock_unlock(play_lock);