*/
#include "map.h" /* for struct Map, init_map() */
#include "misc.h" /* for update_log(), find_passable_pos(), save_game() */
-#include "wincontrol.h" /* for toggle_window() */
+#include "wincontrol.h" /* for create_winconfs(), init_winconfs(), init_wins(),
+ * sorted_wintoggle()
+ */
#include "rrand.h" /* for rrand(), rrand_seed() */
#include "rexit.h" /* for exit_game() */
#include "control.h" /* for meta_control() */
int main(int argc, char *argv[])
{
struct World world;
+ world.turn = 0; /* Turns to 1 when map and objects are initalized. */
init_command_db(&world);
set_cleanup_flag(CLEANUP_COMMAND_DB);
world.monster = 0;
world.item = 0;
init_map_object_defs(&world, "config/defs");
+ set_cleanup_flag(CLEANUP_MAP_OBJECT_DEFS);
/* For interactive mode, try to load world state from savefile. */
char * err_o = "Trouble loading game (fopen() in main()) / "
{
exit_err(1, &world, err_r);
}
+ set_cleanup_flag(CLEANUP_MAP_OBJECTS);
exit_err(fclose(file), &world, err_c);
player.pos.y--;
player.pos.x--;
"opening file 'record' for reading.";
err_r = "Trouble loading record file (read_uint32_bigendian() in "
"main()) / reading from opened file 'record'.";
- world.turn = 1;
if (0 == world.interactive)
{
file = fopen(recordfile, "r");
}
}
-
/* Generate map from seed and, if newly generated world, start positions of
* actors.
*/
struct Map map = init_map();
world.map = ↦
set_cleanup_flag(CLEANUP_MAP);
- if (1 == world.turn)
+ if (0 == world.turn)
{
player.pos = find_passable_pos(world.map);
void * foo;
build_map_objects(&world, foo, 3, 1 + rrand() % 3);
foo = build_map_objects(&world, &world.item, 4, 1 + rrand() % 3);
build_map_objects(&world, foo, 5, 1 + rrand() % 3);
+ set_cleanup_flag(CLEANUP_MAP_OBJECTS);
+ world.turn = 1;
}
/* Initialize window system and windows. */
raw();
init_keybindings(&world);
set_cleanup_flag(CLEANUP_KEYBINDINGS);
- struct WinMeta win_meta;
- char * err_winmem = "Trouble with init_win_meta() or draw_all_wins() in "
- "main().";
- exit_err(init_win_meta(screen, &win_meta), &world, err_winmem);
- world.wins.meta = &win_meta;
- world.wins.keys = init_win_from_file(&world, "Keys", draw_keys_win);
- set_cleanup_flag(CLEANUP_WIN_KEYS);
- world.wins.info = init_win_from_file(&world, "Info", draw_info_win);
- set_cleanup_flag(CLEANUP_WIN_INFO);
- world.wins.log = init_win_from_file(&world, "Log", draw_log_win);
- set_cleanup_flag(CLEANUP_WIN_LOG);
- world.wins.map = init_win_from_file(&world, "Map", draw_map_win);
- set_cleanup_flag(CLEANUP_WIN_MAP);
-
+ char * err_winmem = "Trouble with init_win_meta() in main ().";
+ exit_err(init_win_meta(screen, &world.wmeta), &world, err_winmem);
+ set_cleanup_flag(CLEANUP_WIN_META);
+ // create_winconfs(&world);
+ init_winconfs(&world);
+ set_cleanup_flag(CLEANUP_WINCONFS);
+ init_wins(&world);
+ set_cleanup_flag(CLEANUP_WINS);
sorted_wintoggle(&world);
+ err_winmem = "Trouble with draw_all_wins() in main().";
/* Replay mode. */
int key;
}
while (1)
{
- draw_all_wins(&win_meta);
+ draw_all_wins(world.wmeta);
key = getch();
if ( EOF != action
&& key == get_action_key(world.keybindings, "wait"))
while (1)
{
save_game(&world);
- draw_all_wins(&win_meta);
+ draw_all_wins(world.wmeta);
key = getch();
if (0 != player.hitpoints && 0 == player_control(key, &world))
{