X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fserver%2Finit.c;h=d8ae94f753a1fc66ddbd733c99875a12453254a5;hb=273161a3d8956e98308a79169dcf7c70a89992fe;hp=1644cee35c3f3db6e08771cb7f8295b85dcfa9c5;hpb=65efdbea2c5978de283aab627ca62f5a2c983353;p=plomrogue
diff --git a/src/server/init.c b/src/server/init.c
index 1644cee..d8ae94f 100644
--- a/src/server/init.c
+++ b/src/server/init.c
@@ -1,20 +1,28 @@
/* src/server/init.c */
+#define _POSIX_C_SOURCE 2 /* getopt(), optarg */
#include "init.h"
+#include /* global errno, EEXIST */
#include /* NULL */
#include /* uint32_t */
-#include /* exit(), free() */
-#include /* atoi() */
+#include /* FILE, sprintf(), fflush() */
+#include /* exit(), free(), atoi() */
+#include /* strlen() */
+#include /* mkdir() */
+#include /* defines pid_t, time_t */
#include /* time() */
-#include /* optarg, getopt(), access() */
-#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_sizes(),
- * try_fgets()
+#include /* optarg, getopt(), access(), unlink(), getpid() */
+#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_width(),
+ * try_fgets(), try_fwrite()
*/
#include "../common/rexit.h" /* exit_err() */
+#include "../common/try_malloc.h" /* try_malloc() */
#include "cleanup.h" /* set_cleanup_flag() */
-#include "map_objects.h" /* free_map_objects(), add_map_objects() */
+#include "field_of_view.h" /* build_fov_map() */
#include "map.h" /* init_map() */
-#include "rrand.h" /* rrand() */
+#include "map_objects.h" /* MapObj, MapObjDef, free_map_objects(),
+ * add_map_objects(), get_player()
+ */
#include "run.h" /* obey_msg(), io_loop() */
#include "world.h" /* global world */
@@ -46,28 +54,68 @@ 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(world.path_out, "w", f_name);
+ world.server_test = try_malloc(10 + 1 + 10 + 1 + 1, f_name);
+ sprintf(world.server_test, "%d %d\n", getpid(), (int) time(0));
+ try_fwrite(world.server_test, strlen(world.server_test), 1,
+ world.file_out, f_name);
+ fflush(world.file_out);
+ set_cleanup_flag(CLEANUP_OUT);
+ if (!access(world.path_in, F_OK)) /* This keeps out input from old input */
+ { /* file streams of clients */
+ unlink(world.path_in); /* communicating with server processes */
+ } /* superseded by this current one. */
+ world.file_in = try_fopen(world.path_in, "w", f_name);
+ try_fclose(world.file_in, f_name);
+ world.file_in = try_fopen(world.path_in, "r", f_name);
+ set_cleanup_flag(CLEANUP_IN);
+}
+
+
+
extern void remake_world(uint32_t seed)
{
+ char * f_name = "remake_world()";
free(world.log);
- world.log = NULL;
+ world.log = NULL; /* map_object_action.c's update_log() checks for this. */
world.seed = seed;
world.map_obj_count = 0;
- world.score = 0;
free(world.map.cells);
- if (world.map_objs)
- {
- free_map_objects(world.map_objs);
- }
+ free_map_objects(world.map_objs);
world.last_update_turn = 0;
- world.turn = 1;
init_map();
- add_map_objects(0, 1);
- add_map_objects(1, 1 + rrand() % 27);
- add_map_objects(2, 1 + rrand() % 9);
- add_map_objects(3, 1 + rrand() % 3);
- add_map_objects(4, 1 + rrand() % 3);
- add_map_objects(5, 1 + rrand() % 3);
+ struct MapObjDef * mod;
+ for (mod = world.map_obj_defs; NULL != mod; mod = mod->next)
+ {
+ if (world.player_type == mod->id)
+ {
+ add_map_objects(mod->id, mod->start_n);
+ break;
+ }
+ }
+ for (mod = world.map_obj_defs; NULL != mod; mod = mod->next)
+ {
+ if (world.player_type != mod->id)
+ {
+ add_map_objects(mod->id, mod->start_n);
+ }
+ }
set_cleanup_flag(CLEANUP_MAP_OBJECTS);
+ struct MapObj * mo;
+ for (mo = world.map_objs; NULL != mo; mo = mo->next)
+ {
+ mo->fov_map = mo->lifepoints ? build_fov_map(mo) : NULL;
+ }
+ if (world.turn)
+ {
+ exit_trouble(unlink(world.path_record), f_name, "unlink()");
+ }
+ world.turn = 1;
}
@@ -78,7 +126,7 @@ extern void run_game()
if (!access(world.path_record, F_OK))
{
FILE * file = try_fopen(world.path_record, "r", f_name);
- uint32_t linemax = textfile_sizes(file, NULL);
+ uint32_t linemax = textfile_width(file);
char line[linemax + 1];
while ( (!world.replay || (world.turn < world.replay))
&& NULL != try_fgets(line, linemax + 1, file, f_name))