/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* Known contributors to this file:
* Dave Pare, 1994
* Steve McClure, 2000
- * Markus Armbruster, 2004-2009
+ * Markus Armbruster, 2004-2011
* Ron Koenderink, 2005-2009
*/
#include "empio.h"
#include "empthread.h"
#include "file.h"
+#include "journal.h"
#include "match.h"
#include "misc.h"
#include "nat.h"
pr_id(player, C_INIT, "Empire server ready\n");
- while (player->state != PS_SHUTDOWN) {
+ for (;;) {
io_output(player->iop, 1);
if (io_gets(player->iop, buf, sizeof(buf)) < 0) {
res = io_input(player->iop, 1);
}
continue;
}
+ journal_input(buf);
ac = parse(buf, space, player->argp, NULL, NULL, NULL);
if (ac <= 0) {
pr_id(player, C_BADCMD, "Can't parse command\n");
}
}
player->state = PS_SHUTDOWN;
- if (!io_eof(player->iop)) {
- pr_id(player, C_EXIT, "so long...\n");
- while (io_output(player->iop, 1) > 0) ;
- }
+ pr_id(player, C_EXIT, "so long...\n");
+ while (io_output(player->iop, 1) > 0) ;
player_delete(player);
empth_exit();
/*NOTREACHED*/
}
if (!may_play())
return RET_FAIL;
- other = getplayer((natid)player->cnum);
+ other = getplayer(player->cnum);
if (other) {
natp = getnatp(player->cnum);
if (natp->nat_stat != STAT_VIS) {
empth_set_name(empth_self(), buf);
logerror("%s logged in as country #%d", praddr(player), player->cnum);
pr_id(player, C_INIT, "%d\n", CLIENTPROTO);
+ player->state = PS_PLAYING;
player_main(player);
logerror("%s logged out, country #%d", praddr(player), player->cnum);
- player->state = PS_SHUTDOWN;
+ if (CANT_HAPPEN(!io_eof(player->iop)))
+ io_set_eof(player->iop);
return RET_OK;
}
static int
quit_cmd(void)
{
- pr_id(player, C_EXIT, "so long\n");
- io_shutdown(player->iop, IO_READ);
+ io_set_eof(player->iop);
return RET_OK;
}