X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=b715ca4e74329617085f9dc4317e4f4202d060b2;hb=28b8b4234e395c3fdc4800e5cfb3dcd70a15cadf;hp=906bed266ae54f76edf06d5659a1f87d0fc24ce4;hpb=3dedf6344c941891491773d1cc5d647aa664b218;p=plomrogue

diff --git a/src/server/run.c b/src/server/run.c
index 906bed2..b715ca4 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -1,4 +1,9 @@
-/* src/server/run.c */
+/* src/server/run.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
 
 #define _POSIX_C_SOURCE 200809L
 #include "run.h"
@@ -75,8 +80,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 +212,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 +289,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 +303,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 +320,7 @@ extern uint8_t io_loop()
     {
         char * msg = io_round();
         server_test();
-        if (NULL == msg)
+        if (!msg)
         {
             continue;
         }