X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Finit.c;h=89eea4f8844d1ee64f9ee243a2002ce67b8f1728;hb=639a12151eeb7ce0d18de330b4bb8d9d8094c4d3;hp=75b224c5aa0ec1f0bdb555b6f075a9eb12bce644;hpb=1a8b80508bc0bc6d9e9d3f8c48a8c7c40675c61f;p=plomrogue diff --git a/src/server/init.c b/src/server/init.c index 75b224c..89eea4f 100644 --- a/src/server/init.c +++ b/src/server/init.c @@ -1,12 +1,13 @@ /* src/server/init.c */ +#define _POSIX_C_SOURCE 2 /* getopt(), optarg */ #include "init.h" #include /* global errno, EEXIST */ #include /* NULL */ #include /* uint32_t */ -#include /* sprintf(), fflush() */ -#include /* exit(), free() */ -#include /* atoi(), strlen() */ +#include /* FILE, sprintf(), fflush() */ +#include /* exit(), free(), atoi() */ +#include /* strlen() */ #include /* mkdir() */ #include /* defines pid_t, time_t */ #include /* time() */ @@ -17,12 +18,8 @@ #include "../common/rexit.h" /* exit_err() */ #include "../common/try_malloc.h" /* try_malloc() */ #include "cleanup.h" /* set_cleanup_flag() */ -#include "map_object_actions.h" /* init_map_object_actions() */ -#include "map_objects.h" /* free_map_objects(), add_map_objects(), - * init_map_object_defs() - */ #include "map.h" /* init_map() */ -#include "rrand.h" /* rrand() */ +#include "map_objects.h" /* MapObjDef, free_map_objects(), add_map_objects() */ #include "run.h" /* obey_msg(), io_loop() */ #include "world.h" /* global world */ @@ -54,22 +51,6 @@ extern void obey_argv(int argc, char * argv[]) -extern void init_map_and_map_objects_configs() -{ - world.map.size.x = 64; - world.map.size.y = 64; - world.map.dist_orthogonal = 5; - world.map.dist_diagonal = 7; - char * err_mod = "No map object definitions file."; - char * err_moa = "No map object actions file."; - exit_err(access(world.path_map_obj_defs, F_OK), err_mod); - exit_err(access(world.path_map_obj_acts, F_OK), err_moa); - init_map_object_defs(); - init_map_object_actions(); -} - - - extern void setup_server_io() { char * f_name = "setup_server_io()"; @@ -105,12 +86,22 @@ extern void remake_world(uint32_t seed) free_map_objects(world.map_objs); world.last_update_turn = 0; 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); if (world.turn) {