Update copyright notice

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

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 35b1ca09179e33c58998c373d967c6062aac298b..3f0009b79cd899949c15f7203a0afe184a286050 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-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -34,18 +34,14 @@
 
 #include <config.h>
 
-#include "com.h"
 #include "empio.h"
 #include "empthread.h"
 #include "file.h"
-#include "journal.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"
 #include "player.h"
-#include "proto.h"
 #include "prototypes.h"
-#include "tel.h"
 
 
 static int command(void);
@@ -87,7 +83,6 @@ player_main(struct player *p)
     strcpy(natp->nat_hostaddr, player->hostaddr);
     natp->nat_last_login = player->curup;
     putnat(natp);
-    journal_login();
     if (natp->nat_flags & NF_INFORM && natp->nat_tgms > 0) {
        if (natp->nat_tgms == 1)
            pr("You have a new telegram waiting ...\n");
@@ -110,7 +105,6 @@ player_main(struct player *p)
     update_timeused(natp->nat_last_logout);
     enforce_minimum_session_time();
     pr("Bye-bye\n");
-    journal_logout();
 }
 
 static int
@@ -254,13 +248,14 @@ execute(void)
            continue;
        }
        pr("\nExecute : ");
-       uprnf(buf);
+       uprnf(player->combuf);
        pr("\n");
        if (redir) {
            pr("Execute : redirection not supported\n");
            failed = 1;
-       } else if (dispatch(buf, NULL) < 0)
+       } else if (dispatch(player->combuf, NULL) < 0)
            failed = 1;
+       /* player->aborted not reset; makes next getcommand() fail */
        empth_yield();
     }
     if (failed) {