X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Finit.c;h=43a4d685a5477a2a375f9e7c2fc4c08b6f4c5a86;hb=7c958f842958e0908862c56f07e432c65b4655d3;hp=e9bb3d43836e4590874f0ae125841c7f14fb2a76;hpb=6ac951c41a091ffc723840894ddf1e774739511d;p=plomrogue
diff --git a/src/server/init.c b/src/server/init.c
index e9bb3d4..43a4d68 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"
@@ -11,7 +16,8 @@
#include /* mkdir() */
#include /* defines pid_t, time_t */
#include /* time() */
-#include /* optarg, getopt(), access(), unlink(), getpid() */
+#include /* optarg, getopt(), access(), getpid() */
+#include "../common/parse_file.h" /* err_line_zero(), err_line_inc() */
#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_width(),
* try_fgets(), try_fwrite(),
* detect_atomic_leftover()
@@ -19,51 +25,115 @@
#include "../common/rexit.h" /* exit_err(), exit_trouble() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "cleanup.h" /* set_cleanup_flag() */
-#include "field_of_view.h" /* build_fov_map() */
+#include "field_of_view.h" /* update_map_memory() */
#include "hardcoded_strings.h" /* s */
#include "map.h" /* remake_map() */
#include "things.h" /* Thing, ThingType, free_things(), add_things(),
- * get_player()
+ * get_thing_id_action_id_by_name(), get_player()
*/
-#include "run.h" /* obey_msg(), io_loop() */
+#include "run.h" /* obey_msg(), io_loop(), record(), send_to_outfile() */
#include "world.h" /* global world */
+/* Pass to obey_msg() lines from file at "path", on "record" write to same. Do
+ * not pass lines that consist only of a newline character. Transform newline
+ * in the line passed to \0.
+ */
+static void obey_lines_from_file(char * path, uint8_t record);
+
/* Replay game from record file up to the turn named in world.replay, then turn
* over to manual replay via io_loop().
*/
static void replay_game();
+/* Return 1 if the type defined by world.player_type has a .start_n of 0.
+ * Return 2 if no thing action with .name of s[S_CMD_WAIT] is defined.
+ * Else, return 0.
+ */
+static uint8_t world_cannot_be_made();
+
+
+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 (try_fgets(line, linemax + 1, file, __func__))
+ {
+ if (strlen(line))
+ {
+ if (strcmp("\n", line))
+ {
+ char * nl = strchr(line, '\n');
+ if (nl)
+ {
+ *nl = '\0';
+ }
+ obey_msg(line, record);
+ }
+ err_line_inc();
+ }
+ }
+ free(line);
+ try_fclose(file, __func__);
+}
+
static void replay_game()
{
- char * f_name = "replay_game()";
exit_err(access(s[S_PATH_RECORD], F_OK), "No record found to replay.");
- FILE * file = try_fopen(s[S_PATH_RECORD], "r", f_name);
+ FILE * file = try_fopen(s[S_PATH_RECORD], "r", __func__);
uint32_t linemax = textfile_width(file);
- char * line = try_malloc(linemax + 1, f_name);
+ char * line = try_malloc(linemax + 1, __func__);
while ( world.turn < world.replay
- && NULL != try_fgets(line, linemax + 1, file, f_name))
+ && try_fgets(line, linemax + 1, file, __func__))
{
obey_msg(line, 0);
+ err_line_inc();
}
uint8_t end = 0;
- while (!io_loop())
+ while (3 == io_loop(2))
{
if (!end)
{
- end = (NULL == try_fgets(line, linemax + 1, file, f_name));
+ end = (NULL == try_fgets(line, linemax + 1, file, __func__));
if (!end)
{
obey_msg(line, 0);
+ err_line_inc();
}
}
}
free(line);
- try_fclose(file, f_name);
+ try_fclose(file, __func__);
+}
+
+
+
+static uint8_t world_cannot_be_made()
+{
+ uint8_t player_will_be_generated = 0;
+ struct ThingType * tt;
+ for (tt = world.thing_types; tt; tt = tt->next)
+ {
+ if (world.player_type == tt->id)
+ {
+ player_will_be_generated = 0 < tt->start_n;
+ break;
+ }
+ }
+ if (!player_will_be_generated)
+ {
+ return 1;
+ }
+ if (!get_thing_action_id_by_name(s[S_CMD_WAIT]))
+ {
+ return 2;
+ }
+ return 0;
}
@@ -96,15 +166,14 @@ extern void obey_argv(int argc, char * argv[])
extern void setup_server_io()
{
- char * f_name = "setup_server_io()";
int test = mkdir("server", 0700);
- exit_trouble(test && EEXIST != errno, f_name, "mkdir()");
- world.file_out = try_fopen(s[S_PATH_OUT], "w", f_name);
- world.server_test = try_malloc(10 + 1 + 10 + 1 + 1, f_name);
+ exit_trouble(test && EEXIST != errno, __func__, "mkdir");
+ world.file_out = try_fopen(s[S_PATH_OUT], "w", __func__);
+ world.server_test = try_malloc(10 + 1 + 10 + 1 + 1, __func__);
test = sprintf(world.server_test, "%d %d\n", getpid(), (int) time(0));
- exit_trouble(test < 0, f_name, s[S_FCN_SPRINTF]);
+ exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]);
try_fwrite(world.server_test, strlen(world.server_test), 1,
- world.file_out, f_name);
+ world.file_out, __func__);
fflush(world.file_out);
set_cleanup_flag(CLEANUP_OUT);
char * path_in = s[S_PATH_IN];
@@ -112,25 +181,27 @@ extern void setup_server_io()
{ /* file streams of clients */
unlink(path_in) ; /* communicating with server processes */
} /* superseded by this current one. */
- world.file_in = try_fopen(path_in, "w", f_name);
- try_fclose(world.file_in, f_name);
- world.file_in = try_fopen(path_in, "r", f_name);
+ world.file_in = try_fopen(path_in, "w", __func__);
+ try_fclose(world.file_in, __func__);
+ world.file_in = try_fopen(path_in, "r", __func__);
set_cleanup_flag(CLEANUP_IN);
}
-extern void remake_world()
+extern uint8_t remake_world()
{
- char * f_name = "remake_world()";
- free(world.log);
- world.log = NULL; /* thing_actions.c's update_log() checks for this. */
+ uint8_t test = world_cannot_be_made();
+ if (test)
+ {
+ return test;
+ }
world.seed_map = world.seed;
free_things(world.things);
- world.last_update_turn = 0;
remake_map();
+ world.exists = 1;
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)
{
@@ -138,62 +209,49 @@ extern void remake_world()
break;
}
}
- for (tt = world.thing_types; NULL != tt; tt = tt->next)
+ update_map_memory(get_player());
+ for (tt = world.thing_types; tt; tt = tt->next)
{
if (world.player_type != tt->id)
{
add_things(tt->id, tt->start_n);
}
}
- set_cleanup_flag(CLEANUP_THINGS);
- struct Thing * t;
- for (t = world.things; NULL != t; t = t->next)
- {
- t->fov_map = t->lifepoints ? build_fov_map(t) : NULL;
- }
- if (!world.replay && !access(s[S_PATH_RECORD], F_OK))
- {
- exit_trouble(unlink(s[S_PATH_RECORD]), f_name, "unlink()");
- }
world.turn = 1;
+ send_to_outfile("NEW_WORLD\n", 1);
+ return 0;
}
extern void run_game()
{
- char * f_name = "run_game()";
detect_atomic_leftover(s[S_PATH_SAVE]);
detect_atomic_leftover(s[S_PATH_RECORD]);
+ err_line_zero();
if (world.replay)
{
replay_game();
return;
}
- char * path_savefile = s[S_PATH_SAVE];
- if (!access(path_savefile, F_OK))
+ if (!access(s[S_PATH_SAVE], F_OK))
{
- FILE * file = try_fopen(path_savefile, "r", f_name);
- uint32_t linemax = textfile_width(file);
- char * line = try_malloc(linemax + 1, f_name);
- while (NULL != try_fgets(line, linemax + 1, file, f_name))
- {
- if (strlen(line) && strcmp("\n", line))
- {
- obey_msg(line, 0);
- }
- }
- free(line);
- try_fclose(file, f_name);
+ obey_lines_from_file(s[S_PATH_SAVE], 0);
}
else
{
+ char * err = "No world config file from which to start a new world.";
+ exit_err(access(s[S_PATH_CONFIG], F_OK), err);
+ obey_lines_from_file(s[S_PATH_CONFIG], 1);
+ err_line_zero();
char * command = s[S_CMD_MAKE_WORLD];
- char * msg = try_malloc(strlen(command) + 1 + 11 + 1, f_name);
+ char * msg = try_malloc(strlen(command) + 1 + 11 + 1, __func__);
int test = sprintf(msg, "%s %d", command, (int) time(NULL));
- exit_trouble(test < 0, f_name, s[S_FCN_SPRINTF]);
+ exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]);
obey_msg(msg, 1);
free(msg);
}
- io_loop();
+ err_line_zero();
+ io_loop(1);
+ record(NULL, 1);
}