empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restructure turn() for simpler control flow

Browse source 
Also make it less chatty, and don't suggest that turn off just
disables login.
This commit is contained in:
Markus Armbruster 2009-02-08 20:44:37 +01:00
parent 421119e1f1
commit 72a25644a8
1 changed files with 47 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/lib/commands/turn.c
View file

@ -29,6 +29,8 @@
* *
* Known contributors to this file: * Known contributors to this file:
* Marc Olzheim, 2004 * Marc Olzheim, 2004
* Ron Koenderink, 2005-2007
* Markus Armbruster, 2005-2009
*/ */
#include <config.h> #include <config.h>
@ -40,9 +42,6 @@
#include "commands.h" #include "commands.h"
#include "optlist.h" #include "optlist.h"
/*
* Enable / disable logins and set the message of the day.
*/
int int
turn(void) turn(void)
{ {
@ -52,62 +51,43 @@ turn(void)
char buf[1024]; char buf[1024];
char msgbuf[MAXTELSIZE + 1]; /* UTF-8 */ char msgbuf[MAXTELSIZE + 1]; /* UTF-8 */
char *msgfilepath; char *msgfilepath;
int len; int len, down;
p = getstarg(player->argp[1], "on, off or motd? ", buf); p = getstarg(player->argp[1], "on, off or motd? ", buf);
if (!p) if (!p)
return RET_SYN; return RET_SYN;
if (strcmp(p, "off") == 0) { if (strcmp(p, "off") == 0) {
msgfilepath = downfil; msgfilepath = downfil;
pr("Enter a message explaining the down time.\n");
len = getele("The World", msgbuf);
down = 1;
} else if (strcmp(p, "on") == 0) { } else if (strcmp(p, "on") == 0) {
pr("Removing no-login message and re-enabling logins.\n"); msgfilepath = downfil;
if ((unlink(downfil) == -1) && (errno != ENOENT)) { len = 0;
pr("Could not remove no-login file, logins still disabled.\n"); down = 0;
logerror("Could not remove no-login file (%s).\n", downfil);
return RET_FAIL;
}
game_ctrl_play(1);
return RET_OK;
} else { } else {
msgfilepath = motdfil; msgfilepath = motdfil;
}
if (msgfilepath == downfil)
pr("Enter a message shown to countries trying to log in.\n");
else
pr("Enter a new message of the day.\n"); pr("Enter a new message of the day.\n");
len = getele("The World", msgbuf); len = getele("The World", msgbuf);
if (len < 0) { down = -1;
pr("Ignored\n");
if (msgfilepath == downfil)
pr("NOT disabling logins.\n");
return RET_FAIL;
}
if (len == 0) {
if (msgfilepath == motdfil) {
pr("Removing exsting motd.\n");
if ((unlink(msgfilepath) == -1) && (errno != ENOENT)) {
pr("Could not remove motd.\n");
logerror("Could not remove motd file (%s).\n",
msgfilepath);
return RET_FAIL;
}
return RET_OK;
} else
pr("Writing empty no-login message.\n");
} }
if (len < 0)
return RET_FAIL;
if (len == 0) {
if (unlink(msgfilepath) < 0 && (errno != ENOENT)) {
pr("Could not remove %s file.\n", msgfilepath);
logerror("Could not remove %s file (%s)",
msgfilepath, strerror(errno));
return RET_FAIL;
}
} else {
fptr = fopen(msgfilepath, "wb"); fptr = fopen(msgfilepath, "wb");
if (fptr == NULL) { if (fptr == NULL) {
pr("Something went wrong opening the message file.\n"); pr("Something went wrong opening the message file.\n");
logerror("Could not open message file (%s).\n", msgfilepath); logerror("Could not open message file (%s).\n", msgfilepath);
return RET_FAIL; return RET_FAIL;
} }
if (msgfilepath == downfil)
pr("Logins disabled.\n");
memset(&tgm, 0, sizeof(tgm)); memset(&tgm, 0, sizeof(tgm));
time(&tgm.tel_date); time(&tgm.tel_date);
tgm.tel_length = len; tgm.tel_length = len;
@ -125,9 +105,11 @@ turn(void)
msgfilepath); msgfilepath);
return RET_FAIL; return RET_FAIL;
} }
}
pr("\n"); if (down >= 0)
game_ctrl_play(!down);
game_ctrl_play(0); /* "The game is down" will be printed automatically */
return RET_OK; return RET_OK;
} }