/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2018, 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-2008
+ * Markus Armbruster, 2006-2010
+ * Ron Koenderink, 2004-2009
*/
#include <config.h>
#include <stdio.h>
#include <time.h>
#include "com.h"
-#include "empio.h"
-#include "file.h"
#include "game.h"
#include "match.h"
#include "misc.h"
#include "nat.h"
#include "optlist.h"
#include "player.h"
-#include "proto.h"
#include "prototypes.h"
static void disable_coms(void);
/*
- * Get a command from the current player into COMBUFP[1024], in UTF-8.
+ * Get a command from the current player into @combufp[1024], in UTF-8.
* This may block for input, yielding the processor. Flush buffered
* output when blocking, to make sure player sees the prompt.
* Return command's byte length on success, -1 on error.
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;
int
explain(void)
{
- char *format;
- int i;
+ struct cmndstr *com;
pr("\t\tCurrent EMPIRE Command List\n"
"\t\t------- ------ ------- ----\n"
- "Initial number is cost in B.T.U. units.\n"
+ "Initial number is cost in BTUs.\n"
"Next 2 chars (if present) are:\n"
"$ - must be non-broke\tc -- must have capital\n"
- "Args in [brackets] are optional.\n"
- "All-caps args in <angle brackets>"
+ "Arguments in [brackets] are optional.\n"
+ "All-caps arg
uments in <angle brackets>"
" have the following meanings:\n"
/* FIXME incomplete */
" <NUM> :: a number in unspecified units\n"
" <COMM> :: a commodity such as `food', `guns', etc\n"
" <TYPE> :: an item type such as `ship', `plane', etc\n");
- for (i = 0; (format = player_coms[i].c_form) != 0; i++) {
- if ((player_coms[i].c_permit & player->nstat)
- == player_coms[i].c_permit) {
- pr("%2d ", player_coms[i].c_cost);
- if ((player_coms[i].c_permit & MONEY) == MONEY)
+ for (com = player_coms; com->c_form; com++) {
+ if ((com->c_permit & player->nstat) == com->c_permit) {
+ pr("%2d ", com->c_cost);
+ if (com->c_permit & MONEY)
pr("$");
else
pr(" ");
- if ((player_coms[i].c_permit & CAP) == CAP)
+ if (com->c_permit & CAP)
pr("c");
else
pr(" ");
- pr(" %s\n", format);
+ pr(" %s\n", com->c_form);
}
}
pr("For further info on command syntax see \"info Syntax\".\n");
cmd = comtch(name, player_coms, -1);
if (cmd < 0) {
logerror("Warning: not disabling %s command %s\n",
- cmd == M_NOTUNIQUE ? "ambiguous" : "unknown", name);
+ cmd == M_NOTUNIQUE ? "ambiguous" : "unknown", name);
continue;
}
player_coms[cmd].c_permit |= GOD;
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);
}
void
enforce_minimum_session_time(void)
{
- struct natstr *natp = getnatp(player->cnum);
+ struct natstr *natp = getnatp(player->cnum);
time_t dt = natp->nat_last_logout - natp->nat_last_login;
if (dt > seconds_since_midnight(natp->nat_last_logout))
}
int
-may_play_now(struct natstr *natp, time_t now,
- int suppress_deity_message)
+may_play_now(struct natstr *natp, time_t now)
{
if (CANT_HAPPEN(natp->nat_cnum != player->cnum))
return 0;
- if (!gamehours(now)) {
- if (natp->nat_stat != STAT_GOD || !suppress_deity_message)
- pr("Empire hours restriction in force\n");
+ if (gamehours(now)) {
+ if (player->flags & PF_HOURS) {
+ pr("\nEmpire hours restriction lifted\n");
+ player->flags &= ~PF_HOURS;
+ }
+ } else {
+ if (!(player->flags & PF_HOURS)) {
+ pr("\nEmpire hours restriction in force\n");
+ player->flags |= PF_HOURS;
+ }
if (natp->nat_stat != STAT_GOD)
return 0;
}
if (game_play_disabled()) {
- if (natp->nat_stat != STAT_GOD) {
+ if (!(player->flags & PF_DOWN)) {
show_first_tel(downfil);
pr("\nThe game is down\n");
- return 0;
+ player->flags |= PF_DOWN;
}
- if (!suppress_deity_message)
- pr("The game is down\n");
- }
+ if (natp->nat_stat != STAT_GOD)
+ return 0;
+ } else
+ player->flags &= ~PF_DOWN;
if ((natp->nat_stat != STAT_GOD && natp->nat_stat != STAT_VIS)
&& natp->nat_timeused > m_m_p_d * 60) {
projects / empserver / blobdiff