(close_files, finish_server, panic):
Rename close_files() to ef_close_srv() and move to fileinit.c. Replace calls to close_files() with ef_fin_srv(). Call ef_close_srv() from ef_fin_srv(). (ef_close_srv, ef_fin_srv): New. (init_files, init_server, ef_init_srv): Rename init_files() to ef_open_srv() and move to fileinit.c. Remove call to init_files() from init_server() and replace with a call to ef_open_srv() from ef_init_srv(). (ef_open_srv): New. (ef_load, init_server, ef_init_srv): Move the call to ef_load() from init_server() to ef_init_srv(). (global_init, init_server, ef_init_srv): Move the call to global_init() from init_server() to ef_init_srv(). (nullify_objects, global_init, init_server): Split nullify_objects() into init_lchr() and init_dchr(). Locate init_lchr() and init_dchr() in init.c. Add calls to init_lchr() and to init_dchr() from global_init(). (init_lchr(), init_dchr()): New.
This commit is contained in:
parent
803009d0ce
commit
e89fb0bb17
4 changed files with 81 additions and 70 deletions
|
@ -42,6 +42,8 @@
|
|||
static void init_mchr(void);
|
||||
static void init_pchr(void);
|
||||
static void init_plchr(void);
|
||||
static void init_dchr(void);
|
||||
static void init_lchr(void);
|
||||
|
||||
void
|
||||
global_init(void)
|
||||
|
@ -49,6 +51,8 @@ global_init(void)
|
|||
init_pchr();
|
||||
init_mchr();
|
||||
init_plchr();
|
||||
init_dchr();
|
||||
init_lchr();
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -89,3 +93,21 @@ init_pchr(void)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
init_dchr()
|
||||
{
|
||||
if (opt_BIG_CITY)
|
||||
dchr[SCT_CAPIT] = bigcity_dchr;
|
||||
}
|
||||
|
||||
static void
|
||||
init_lchr()
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; lchr[i].l_name; i++) {
|
||||
/* Fix up the military values */
|
||||
lchr[i].l_mil = lchr[i].l_item[I_MILIT];
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue