/* main.c */
-#include "main.h"
+#include "main.h" /* for world global */
#include <stdlib.h> /* for atoi(), exit(), EXIT_FAILURE */
#include <stdio.h> /* for FILE typedef, F_OK */
-#include <ncurses.h> /* for initscr(), noecho(), curs_set(), keypad(), raw() */
+#include <ncurses.h> /* for noecho(), curs_set(), keypad(), raw() */
#include <time.h> /* for time() */
#include <unistd.h> /* for getopt(), optarg */
-#include <stdint.h> /* for uint16_t, uint32_t */
-#include "windows.h" /* for structs WinMeta, Win, init_win_meta(), draw_all_wins()
+#include <stdint.h> /* for uint32_t */
+#include "windows.h" /* for structs WinMeta, Win, init_win_meta(),
+ * draw_all_wins()
*/
-#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian](),
- * try_fopen(), try_fclose(), try_fclose_unlink_rename()
+#include "readwrite.h" /* for try_fgetc(), read_uint32_bigendian(),
+ * write_uint32_bigendian(), try_fopen(), try_fclose(),
+ * try_fclose_unlink_rename(), try_fgetc_noeof(),
*/
-#include "map_objects.h" /* for structs Monster, Item, Player,
- * init_map_object_defs(), read_map_objects(),
- * build_map_objects()
+#include "map_objects.h" /* for structs MapObj, init_map_object_defs(),
+ * add_map_objects(), get_player()
*/
#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()
+#include "misc.h" /* for update_log(), save_game(), try_calloc(), load_game(),
+ * check_tempfile(), check_files_xor(), load_interface_conf(),
+ * 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() */
-#include "control.h" /* for *_control(), get_available_keycode_to_action() */
+#include "rexit.h" /* for exit_game() */
+#include "command_db.h" /* for init_command_db(), is_command_id_shortdsc() */
+#include "control.h" /* for control_by_id(), player_control(),
+ * get_available_keycode_to_action()
+ */
+#include "map_object_actions.h" /* for init_map_object_actions() */
int main(int argc, char *argv[])
{
char * f_name = "main()";
- struct World world;
world.turn = 0; /* Turns to 1 when map and objects are initalized. */
- init_command_db(&world);
+ /* Initialize commands and map object actions. */
+ init_command_db();
set_cleanup_flag(CLEANUP_COMMAND_DB);
+ init_map_object_actions();
+ set_cleanup_flag(CLEANUP_MAP_OBJECT_ACTS);
/* Check for corrupted savefile / recordfile savings. */
char * recordfile = "record";
char * savefile = "savefile";
char * recordfile_tmp = "record_tmp";
char * savefile_tmp = "savefile_tmp";
- check_files_xor(savefile, recordfile, &world);
- check_tempfile(recordfile_tmp, &world);
- check_tempfile(savefile_tmp, &world);
- check_tempfile("config/windows/Win_tmp_k", &world);
- check_tempfile("config/windows/Win_tmp_m", &world);
- check_tempfile("config/windows/Win_tmp_i", &world);
- check_tempfile("config/windows/Win_tmp_l", &world);
- check_tempfile("config/windows/toggle_order_tmp", &world);
+ check_files_xor(savefile, recordfile);
+ check_tempfile(recordfile_tmp);
+ check_tempfile(savefile_tmp);
+ check_tempfile("config/windows/Win_tmp_k");
+ check_tempfile("config/windows/Win_tmp_m");
+ check_tempfile("config/windows/Win_tmp_i");
+ check_tempfile("config/windows/Win_tmp_l");
+ check_tempfile("config/windows/toggle_order_tmp");
/* Read in startup options (i.e. replay option and replay start turn). */
int opt;
}
}
- /* Initialize log, player, monster/item definitions and monsters/items. */
+ /* Initialize log and map object definitions. */
world.score = 0;
- world.log = try_calloc(1, sizeof(char), &world, f_name);
+ world.log = try_calloc(1, sizeof(char), f_name);
set_cleanup_flag(CLEANUP_LOG);
- update_log(&world, " ");
- struct Player player;
- player.hitpoints = 5;
- world.player = &player;
- world.monster = 0;
- world.item = 0;
- init_map_object_defs(&world, "config/defs");
+ update_log(" ");
+ init_map_object_defs("config/defs");
set_cleanup_flag(CLEANUP_MAP_OBJECT_DEFS);
- world.map_object_count = 1;
+ world.map_obj_count = 0;
/* For interactive mode, try to load world state from savefile. */
- char * err_r = "Trouble loading game (in main()) / "
- "reading from opened 'savefile'.";
FILE * file;
if (1 == world.interactive && 0 == access(savefile, F_OK))
{
- file = try_fopen(savefile, "r", &world, f_name);
- if ( read_uint32_bigendian(file, &world.seed)
- || read_uint32_bigendian(file, &world.turn)
- || read_uint16_bigendian(file, &world.score)
- || read_uint16_bigendian(file, &player.pos.y)
- || read_uint16_bigendian(file, &player.pos.x)
- || read_uint8(file, &player.hitpoints)
- || read_map_objects(&world, &world.monster, file)
- || read_map_objects(&world, &world.item, file))
- {
- exit_err(1, &world, err_r);
- }
+ load_game();
set_cleanup_flag(CLEANUP_MAP_OBJECTS);
- try_fclose(file, &world, f_name);
- player.pos.y--;
- player.pos.x--;
}
/* For non-interactive mode, try to load world state from record file. */
else
{
- err_r = "Trouble reading from 'record' file (read_uint32_bigendian() "
- "in main()).";
if (0 == world.interactive)
{
- file = try_fopen(recordfile, "r", &world, f_name);
- exit_err(read_uint32_bigendian(file, &world.seed), &world, err_r);
+ file = try_fopen(recordfile, "r", f_name);
+ world.seed = read_uint32_bigendian(file);
}
/* For interactive-mode in newly started world, generate a start seed
else
{
world.seed = time(NULL);
-
- char * err_w = "Trouble recording new seed "
- "(write_uint32_bigendian() in main()) / writing to "
- "file 'record_tmp'.";
- file = try_fopen(recordfile_tmp, "w", &world, f_name);
- exit_err(write_uint32_bigendian(world.seed, file), &world, err_w);
- try_fclose_unlink_rename(file, recordfile_tmp, recordfile,
- &world, f_name);
+ file = try_fopen(recordfile_tmp, "w", f_name);
+ write_uint32_bigendian(world.seed, file);
+ 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);
if (0 == world.turn)
{
- player.pos = find_passable_pos(world.map);
- void * foo;
- foo = build_map_objects(&world, &world.monster, 1, 1 + rrand() % 27);
- foo = build_map_objects(&world, foo, 2, 1 + rrand() % 9);
- 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);
+ world.map_objs = NULL;
+ 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);
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), &world, 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 Win * win_map = get_win_by_id(&world, 'm');
- map_center_player(&map, &player, win_map->frame.size);
+ struct MapObj * player = get_player();
+ struct Win * win_map = get_win_by_id('m');
+ win_map->center = player->pos;
+
+ /* Initialize player's inventory selection index to start position. */
+ world.inventory_sel = 0;
/* Replay mode. */
int key;
{
while (world.turn != start_turn)
{
- action = getc(file);
+ action = try_fgetc(file, f_name);
if (EOF == action)
{
break;
}
- record_control(action, &world);
+ if ( is_command_id_shortdsc(action, "drop")
+ || is_command_id_shortdsc(action, "use"))
+ {
+ world.inventory_sel = try_fgetc_noeof(file, f_name);
+ }
+ player_control_by_id(action);
}
}
while (1)
{
- draw_all_wins(world.wmeta);
+ draw_all_wins();
key = getch();
- wc = get_winconf_by_win(&world, world.wmeta->active);
- if ( (1 == wc->view && wingeom_control(key, &world))
- || (2 == wc->view && winkeyb_control(key, &world)))
+ wc = get_winconf_by_win(world.wmeta->active);
+ if ( (1 == wc->view && wingeom_control(key))
+ || (2 == wc->view && winkeyb_control(key)))
{
continue;
}
if ( EOF != action
- && key == get_available_keycode_to_action(&world, "wait"))
+ && key == get_available_keycode_to_action("wait"))
{
- action = getc(file);
+ action = try_fgetc(file, f_name);
if (EOF != action)
{
- record_control(action, &world);
+ if ( is_command_id_shortdsc(action, "drop")
+ || is_command_id_shortdsc(action, "use"))
+ {
+ world.inventory_sel = try_fgetc_noeof(file, f_name);
+ }
+ player_control_by_id(action);
}
}
- else if (meta_control(key, &world))
+ else if (meta_control(key))
{
- try_fclose(file, &world, f_name);
- exit_game(&world);
+ try_fclose(file, f_name);
+ exit_game();
}
}
}
{
while (1)
{
- save_game(&world);
- draw_all_wins(world.wmeta);
+ save_game();
+ draw_all_wins();
key = getch();
- wc = get_winconf_by_win(&world, world.wmeta->active);
- if (1 == wc->view && wingeom_control(key, &world))
+ wc = get_winconf_by_win(world.wmeta->active);
+ if ( (1 == wc->view && wingeom_control(key))
+ || (2 == wc->view && winkeyb_control(key))
+ || (0 != player->lifepoints && player_control_by_key(key)))
{
continue;
}
- else if (2 == wc->view && winkeyb_control(key, &world))
- {
- continue;
- }
-
- if ( (1 == wc->view && wingeom_control(key, &world))
- || (2 == wc->view && winkeyb_control(key, &world))
- || (0 != player.hitpoints && player_control(key, &world)))
- {
- continue;
- }
-
- if (meta_control(key, &world))
+ if (meta_control(key))
{
- exit_game(&world);
+ exit_game();
}
}
}
projects / plomrogue / blobdiff