/*
* 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-2013, 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, 2006-2009
+ * Markus Armbruster, 2006-2010
* Ron Koenderink, 2004-2009
*/
#include <stdio.h>
#include <time.h>
#include "com.h"
-#include "empio.h"
#include "file.h"
#include "game.h"
#include "match.h"
#include "nat.h"
#include "optlist.h"
#include "player.h"
-#include "proto.h"
#include "prototypes.h"
int
getcommand(char *combufp)
{
- struct natstr *natp = getnatp(player->cnum);
char buf[1024]; /* user text */
- if (++player_commands_index >= KEEP_COMMANDS)
- player_commands_index = 0;
- sprintf(player_commands[player_commands_index], "%3d %3d [prompt]",
- player_commands_index, player->cnum);
-
- do {
- prprompt(natp->nat_timeused / 60, natp->nat_btu);
- buf[0] = 0;
- if (recvclient(buf, 1024) < 0) {
- return -1;
- }
- } while (buf[0] == 0);
+ if (recvclient(buf, sizeof(buf)) < 0)
+ return -1;
if (++player_commands_index >= KEEP_COMMANDS)
player_commands_index = 0;
time_t dt = now - player->lasttime;
if (dt > midnight_secs)
- natp->nat_timeused = midnight_secs;
+ natp->nat_timeused = midnight_secs;
else
- natp->nat_timeused += dt;
+ natp->nat_timeused += dt;
player->lasttime = now;
putnat(natp);
}