X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fserver%2Finit.c;h=ee9f9c276872897e121c7acca1b7268bd4ec3c27;hb=2b2a1e0169b3a863fd87b679d789a4e2b789eb67;hp=49ba22a62732b0f5c818536cd77aac809420ace4;hpb=c31d3a8d3f993a2cfcc8c5e438283e3a693d5b27;p=plomrogue
diff --git a/src/server/init.c b/src/server/init.c
index 49ba22a..ee9f9c2 100644
--- a/src/server/init.c
+++ b/src/server/init.c
@@ -1,4 +1,9 @@
-/* src/server/init.c */
+/* src/server/init.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 2 /* getopt(), optarg */
#include "init.h"
@@ -55,7 +60,7 @@ static void obey_lines_from_file(char * path, uint8_t record)
FILE * file = try_fopen(path, "r", __func__);
uint32_t linemax = textfile_width(file);
char * line = try_malloc(linemax + 1, __func__);
- while (NULL != try_fgets(line, linemax + 1, file, __func__))
+ while (try_fgets(line, linemax + 1, file, __func__))
{
if (strlen(line))
{
@@ -84,7 +89,7 @@ static void replay_game()
uint32_t linemax = textfile_width(file);
char * line = try_malloc(linemax + 1, __func__);
while ( world.turn < world.replay
- && NULL != try_fgets(line, linemax + 1, file, __func__))
+ && try_fgets(line, linemax + 1, file, __func__))
{
obey_msg(line, 0, 1);
err_line_inc();
@@ -112,7 +117,7 @@ static uint8_t world_cannot_be_made()
{
uint8_t player_will_be_generated = 0;
struct ThingType * tt;
- for (tt = world.thing_types; NULL != tt; tt = tt->next)
+ for (tt = world.thing_types; tt; tt = tt->next)
{
if (world.player_type == tt->id)
{
@@ -191,13 +196,11 @@ extern uint8_t remake_world()
{
return test;
}
- free(world.log);
- world.log = NULL; /* thing_actions.c's update_log() checks for this. */
world.seed_map = world.seed;
free_things(world.things);
remake_map();
struct ThingType * tt;
- for (tt = world.thing_types; NULL != tt; tt = tt->next)
+ for (tt = world.thing_types; tt; tt = tt->next)
{
if (world.player_type == tt->id)
{
@@ -205,7 +208,7 @@ extern uint8_t remake_world()
break;
}
}
- for (tt = world.thing_types; NULL != tt; tt = tt->next)
+ for (tt = world.thing_types; tt; tt = tt->next)
{
if (world.player_type != tt->id)
{
@@ -213,7 +216,7 @@ extern uint8_t remake_world()
}
}
struct Thing * t;
- for (t = world.things; NULL != t; t = t->next)
+ for (t = world.things; t; t = t->next)
{
if (t->lifepoints)
{