X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=301a0bae48987c375851a5133aacf35aa0a05557;hb=ca22fd77389df670bc483c43ae03f4d76023816f;hp=906bed266ae54f76edf06d5659a1f87d0fc24ce4;hpb=3dedf6344c941891491773d1cc5d647aa664b218;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 906bed2..301a0ba 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -75,8 +75,7 @@ static uint8_t player_commands_allowed()
{
if (!world.exists)
{
- err_line(1, "No world exists in which to run player commands.");
- return 0;
+ return !err_line(1, "No world exists in which to run player commands.");
}
return 1;
}
@@ -208,7 +207,7 @@ static void turn_over()
while ( 0 < player->lifepoints
|| (0 == player->lifepoints && start_turn == world.turn))
{
- if (NULL == thing)
+ if (!thing)
{
world.turn++;
thing = world.things;
@@ -285,7 +284,7 @@ extern void obey_msg(char * msg, uint8_t do_record, uint8_t do_verbose)
set_err_line_options("Trouble with message: ", msg, 0);
char * msg_copy = strdup(msg);
char * tok0 = token_from_line(msg_copy);
- if (NULL != tok0)
+ if (tok0)
{
if (parse_command(tok0))
@@ -299,7 +298,7 @@ extern void obey_msg(char * msg, uint8_t do_record, uint8_t do_verbose)
record(msg, 0);
}
char * tokplus = token_from_line(NULL);
- err_line(NULL != tokplus, "Too many arguments, ignoring overflow.");
+ err_line(!(!tokplus), "Too many arguments, ignoring overflow.");
free(msg_copy);
return;
}
@@ -316,7 +315,7 @@ extern uint8_t io_loop()
{
char * msg = io_round();
server_test();
- if (NULL == msg)
+ if (!msg)
{
continue;
}