/* src/server/init.c */
-#define _POSIX_C_SOURCE 200809L /* getopt(), optarg, strdup() */
+#define _POSIX_C_SOURCE 2 /* getopt(), optarg */
#include "init.h"
#include <errno.h> /* global errno, EEXIST */
#include <stddef.h> /* NULL */
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "cleanup.h" /* set_cleanup_flag() */
-#include "configfile.h" /* read_config_file() */
#include "map.h" /* init_map() */
-#include "map_objects.h" /* free_map_objects(), add_map_objects() */
-#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 */
-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;
- read_config_file();
-}
-
-
-
extern void setup_server_io()
{
char * f_name = "setup_server_io()";
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)
{