X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Finit.c;h=89eea4f8844d1ee64f9ee243a2002ce67b8f1728;hb=8bdc3ca1ee8ef89c0d9a6bce35bead180ce67893;hp=3bbd5035c6fa2f4c1bb5e10424db0619f6e64a35;hpb=fa079cbd21aacfc0d28a5af98cc3df4a7633f563;p=plomrogue
diff --git a/src/server/init.c b/src/server/init.c
index 3bbd503..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() */
@@ -16,16 +17,9 @@
*/
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
-#include "cleanup.h" /* set_cleanup_flag(), CLEANUP_MAP_OBJ_DEFS,
- * CLEANUP_MAP_OBJ_ACTS
- */
-#include "io.h" /* read_config_file(), struct EntrySkeleton */
+#include "cleanup.h" /* set_cleanup_flag() */
#include "map.h" /* init_map() */
-#include "map_object_actions.h" /* struct MapObjAct, read_map_object_action() */
-#include "map_objects.h" /* struct MapObjDef, free_map_objects(),
- * add_map_objects(), read_map_object_def()
- */
-#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 */
@@ -57,26 +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);
- read_config_file(world.path_map_obj_defs, CLEANUP_MAP_OBJECT_DEFS,
- read_map_object_def, sizeof(struct MapObjDef),
- (struct EntrySkeleton **) &world.map_obj_defs);
- read_config_file(world.path_map_obj_acts, CLEANUP_MAP_OBJECT_ACTS,
- read_map_object_action, sizeof(struct MapObjAct),
- (struct EntrySkeleton **) &world.map_obj_acts);
-}
-
-
-
extern void setup_server_io()
{
char * f_name = "setup_server_io()";
@@ -112,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)
{