#include "map.h" /* for struct Map, init_map() */
#include "misc.h" /* for update_log(), find_passable_pos(), save_game(),
* try_calloc(), check_tempfile(), check_xor_files(),
- * load_interface_conf(), load_game()
+ * load_interface_conf(), load_game(), rrand()
*/
#include "wincontrol.h" /* get_win_by_id(), get_winconf_by_win() */
-#include "rrand.h" /* for rrand(), rrand_seed() */
#include "rexit.h" /* for exit_game(), exit_err() */
#include "command_db.h" /* for init_command_db(), is_command_id_shortdsc() */
-#include "control.h" /* for *_control(), get_available_keycode_to_action() */
+#include "control.h" /* for control_by_id(), player_control(),
+ * get_available_keycode_to_action()
+ */
+#include "map_object_actions.h" /* for init_map_object_actions() */
char * f_name = "main()";
world.turn = 0; /* Turns to 1 when map and objects are initalized. */
+ /* Initialize commands and map object actions. */
init_command_db();
set_cleanup_flag(CLEANUP_COMMAND_DB);
+ init_map_object_actions();
+ set_cleanup_flag(CLEANUP_MAPOBJACTS);
/* Check for corrupted savefile / recordfile savings. */
char * recordfile = "record";
exit_err(write_uint32_bigendian(world.seed, file), err_w);
try_fclose_unlink_rename(file, recordfile_tmp, recordfile, f_name);
}
+ world.mapseed = world.seed;
}
/* Generate map from seed and, if newly generated world, start positions of
* actors.
*/
- rrand_seed(world.seed);
+ uint32_t restore_seed = world.seed;
+ world.seed = world.mapseed;
struct Map map = init_map();
world.map = ↦
set_cleanup_flag(CLEANUP_MAP);
set_cleanup_flag(CLEANUP_MAP_OBJECTS);
world.turn = 1;
}
+ world.seed = restore_seed;
/* Initialize window system and windows. */
- WINDOW * screen = initscr();
+ init_win_meta();
set_cleanup_flag(CLEANUP_NCURSES);
noecho();
curs_set(0);
- keypad(screen, TRUE);
+ keypad(world.wmeta->screen, TRUE);
raw();
- char * err_winmem = "Trouble with init_win_meta() in main ().";
- exit_err(init_win_meta(screen, &world.wmeta), err_winmem);
- set_cleanup_flag(CLEANUP_WIN_META);
- load_interface_conf(/*&world*/);
- set_cleanup_flag(CLEANUP_INTERFACE_CONF);
- err_winmem = "Trouble with draw_all_wins() in main().";
+ load_interface_conf();
+ set_cleanup_flag(CLEANUP_INTERFACE);
/* Focus map on player. */
struct MapObj * player = get_player();
{
break;
}
- if (is_command_id_shortdsc(action, "drop"))
+ if ( is_command_id_shortdsc(action, "drop")
+ || is_command_id_shortdsc(action, "use"))
{
world.inventory_select = getc(file);
}
- record_control(action);
+ player_control_by_id(action);
}
}
while (1)
{
- draw_all_wins(world.wmeta);
+ draw_all_wins();
key = getch();
wc = get_winconf_by_win(world.wmeta->active);
if ( (1 == wc->view && wingeom_control(key))
action = getc(file);
if (EOF != action)
{
- if (is_command_id_shortdsc(action, "drop"))
+ if ( is_command_id_shortdsc(action, "drop")
+ || is_command_id_shortdsc(action, "use"))
{
world.inventory_select = getc(file);
}
- record_control(action);
+ player_control_by_id(action);
}
}
else if (meta_control(key))
while (1)
{
save_game();
- draw_all_wins(world.wmeta);
+ draw_all_wins();
key = getch();
wc = get_winconf_by_win(world.wmeta->active);
- if (1 == wc->view && wingeom_control(key))
- {
- continue;
- }
- else if (2 == wc->view && winkeyb_control(key))
- {
- continue;
- }
-
if ( (1 == wc->view && wingeom_control(key))
|| (2 == wc->view && winkeyb_control(key))
- || (0 != player->lifepoints && player_control(key)))
+ || (0 != player->lifepoints && player_control_by_key(key)))
{
continue;
}
-
if (meta_control(key))
{
exit_game();