X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmain.c;h=046ef1ad952f3cec1a8a2786a6117ee87cf44ce5;hb=967562b96d9903fc73ee04716dbeb639e18db823;hp=1f9d7f7b89c01ee591f8ce911433f9238f323be8;hpb=b392e7b60ee954f1a8476d2cd2d92538b1873b2f;p=plomrogue
diff --git a/src/main.c b/src/main.c
index 1f9d7f7..046ef1a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,66 +1,61 @@
/* main.c */
#include "main.h"
-#include /* for atoi(), exit(), EXIT_FAILURE, calloc() */
-#include /* for FILE typedef, F_OK, rename() */
+#include /* for atoi(), exit(), EXIT_FAILURE */
+#include /* for FILE typedef, F_OK */
#include /* for initscr(), noecho(), curs_set(), keypad(), raw() */
#include /* for time() */
-#include /* for unlink(), getopt(), optarg */
-#include /* for uint8_t */
-#include /* for errno */
+#include /* for getopt(), optarg */
+#include /* for uint16_t, uint32_t */
#include "windows.h" /* for structs WinMeta, Win, init_win(), init_win_meta(),
* draw_all_wins()
*/
-#include "draw_wins.h" /* for draw_keys_win(), draw_map_win(), draw_info_win(),
- * draw_log_win()
+#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian](),
+ * try_fopen(), try_fclose(), try_fclose_unlink_rename()
*/
-#include "keybindings.h" /* for initkeybindings(), get_action_key() */
-#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */
#include "map_objects.h" /* for structs Monster, Item, Player,
* init_map_object_defs(), read_map_objects(),
* build_map_objects()
*/
-#include "map_object_actions.h" /* for player_wait(), move_player() */
#include "map.h" /* for struct Map, init_map() */
-#include "misc.h" /* for update_log(), toggle_window(), find_passable_pos(),
- * meta_keys(), save_game()
+#include "misc.h" /* for update_log(), find_passable_pos(), save_game(),
+ * try_calloc(), check_tempfile(), check_xor_files()
*/
-#include "yx_uint16.h" /* for dir enum */
+#include "wincontrol.h" /* for create_winconfs(), init_winconfs(), init_wins(),
+ * sorted_wintoggle_and_activate()
+ */
#include "rrand.h" /* for rrand(), rrand_seed() */
-#include "rexit.h" /* for exit_game() */
+#include "rexit.h" /* for exit_game(), exit_err() */
+#include "command_db.h" /* for init_command_db() */
+#include "control.h" /* for *_control() */
+#include "keybindings.h" /* for init_keybindings(),
+ * get_available_keycode_to_action()
+ */
+
+
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);
+ set_cleanup_flag(CLEANUP_COMMAND_DB);
+
+ /* Check for corrupted savefile / recordfile savings. */
char * recordfile = "record";
char * savefile = "savefile";
- char * err_x = "A file 'record' exists, but no 'savefile'. If everything "
- "was in order, both or none would exist. I won't start "
- "until this is corrected.";
- if (!access(recordfile, F_OK) && access(savefile, F_OK))
- {
- errno = 0;
- exit_err(1, &world, err_x);
- }
- err_x = "A 'savefile' exists, but no file 'record'. If everything "
- "was in order, both or none would exist. I won't start "
- "until this is corrected.";
-
- if (!access(savefile, F_OK) && access(recordfile, F_OK))
- {
- errno = 0;
- exit_err(1, &world, err_x);
- }
char * recordfile_tmp = "record_tmp";
char * savefile_tmp = "savefile_tmp";
- err_x = "A file 'recordfile_tmp' exists, probably from a corrupted "
- "previous record saving process. To avoid game record "
- "corruption, I won't start until it is removed or renamed.";
- exit_err(!access(recordfile_tmp, F_OK), &world, err_x);
- err_x = "A file 'savefile_tmp' exists, probably from a corrupted "
- "previous game saving process. To avoid savegame "
- "corruption, I won't start until it is removed or renamed.";
- exit_err(!access(savefile_tmp, F_OK), &world, err_x);
+ 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);
/* Read in startup options (i.e. replay option and replay start turn). */
int opt;
@@ -71,39 +66,42 @@ int main(int argc, char *argv[])
switch (opt)
{
case 's':
+ {
world.interactive = 0;
start_turn = 0;
if (optarg)
+ {
start_turn = atoi(optarg);
- break;
+ }
+ break;
+ }
default:
+ {
exit(EXIT_FAILURE);
+ }
}
}
/* Initialize log, player, monster/item definitions and monsters/items. */
- world.log = calloc(1, sizeof(char));
+ world.score = 0;
+ world.log = try_calloc(1, sizeof(char), &world, f_name);
set_cleanup_flag(CLEANUP_LOG);
- update_log (&world, " ");
+ update_log(&world, " ");
struct Player player;
player.hitpoints = 5;
world.player = &player;
world.monster = 0;
world.item = 0;
- init_map_object_defs(&world, "defs");
+ 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()) / "
- "opening 'savefile' for reading.";
char * err_r = "Trouble loading game (in main()) / "
"reading from opened 'savefile'.";
- char * err_c = "Trouble loading game (fclose() in main()) / "
- "closing opened 'savefile'.";
FILE * file;
if (1 == world.interactive && 0 == access(savefile, F_OK))
{
- file = fopen(savefile, "r");
- exit_err(0 == file, &world, err_o);
+ 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)
@@ -115,7 +113,8 @@ int main(int argc, char *argv[])
{
exit_err(1, &world, err_r);
}
- exit_err(fclose(file), &world, err_c);
+ set_cleanup_flag(CLEANUP_MAP_OBJECTS);
+ try_fclose(file, &world, f_name);
player.pos.y--;
player.pos.x--;
}
@@ -123,15 +122,11 @@ int main(int argc, char *argv[])
/* For non-interactive mode, try to load world state from record file. */
else
{
- err_o = "Trouble loading record file (fopen() in main()) / "
- "opening file 'record' for reading.";
- err_r = "Trouble loading record file (read_uint32_bigendian() in "
- "main()) / reading from opened file 'record'.";
- world.turn = 1;
+ err_r = "Trouble reading from 'record' file (read_uint32_bigendian() "
+ "in main()).";
if (0 == world.interactive)
{
- file = fopen(recordfile, "r");
- exit_err(NULL == file, &world, err_o);
+ file = try_fopen(recordfile, "r", &world, f_name);
exit_err(read_uint32_bigendian(file, &world.seed), &world, err_r);
}
@@ -141,26 +136,17 @@ int main(int argc, char *argv[])
else
{
world.seed = time(NULL);
- world.score = 0;
- err_o = "Trouble recording new seed (fopen() in main()) / "
- "opening 'record_tmp' file for writing.";
char * err_w = "Trouble recording new seed "
"(write_uint32_bigendian() in main()) / writing to "
- "opened file 'record_tmp'.";
- err_c = "Trouble recording new seed (fclose() in main()) / "
- "closing opened file 'record_tmp'.";
- char * err_m = "Trouble recording new seed (rename() in main()) : "
- "renaming file 'record_tmp' to 'record'.";
- file = fopen(recordfile_tmp, "w");
- exit_err(0 == file, &world, err_o);
+ "file 'record_tmp'.";
+ file = try_fopen(recordfile_tmp, "w", &world, f_name);
exit_err(write_uint32_bigendian(world.seed, file), &world, err_w);
- exit_err(fclose(file), &world, err_c);
- exit_err(rename(recordfile_tmp, recordfile), &world, err_m);
+ try_fclose_unlink_rename(file, recordfile_tmp, recordfile,
+ &world, f_name);
}
}
-
/* Generate map from seed and, if newly generated world, start positions of
* actors.
*/
@@ -168,7 +154,7 @@ int main(int argc, char *argv[])
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;
@@ -177,6 +163,8 @@ int main(int argc, char *argv[])
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. */
@@ -186,89 +174,60 @@ int main(int argc, char *argv[])
curs_set(0);
keypad(screen, TRUE);
raw();
- init_keybindings(&world);
+ init_keybindings(&world, "config/keybindings_global", &world.kb_global);
+ init_keybindings(&world, "config/keybindings_wingeom", &world.kb_wingeom);
+ init_keybindings(&world, "config/keybindings_winkeys", &world.kb_winkeys);
set_cleanup_flag(CLEANUP_KEYBINDINGS);
- struct WinMeta win_meta;
- char * err_winmem = "Trouble with init_win() or draw_all_wins() in main().";
- exit_err(init_win_meta(screen, &win_meta), &world, err_winmem);
- struct Win win_keys = init_win(&win_meta, "Keys",
- 0, 29, &world, draw_keys_win);
- struct Win win_info = init_win(&win_meta, "Info",
- 3, 20, &world, draw_info_win);
- uint16_t height_logwin = win_meta.padframe.size.y
- - (2 + win_info.frame.size.y);
- struct Win win_log = init_win(&win_meta, "Log",
- height_logwin, 20, &world, draw_log_win);
- uint16_t width_mapwin = win_meta.padframe.size.x - win_keys.frame.size.x
- - win_log.frame.size.x - 2;
- struct Win win_map = init_win(&win_meta, "Map",
- 0, width_mapwin, &world, draw_map_win);
- toggle_window(&win_meta, &win_keys);
- toggle_window(&win_meta, &win_map);
- toggle_window(&win_meta, &win_info);
- toggle_window(&win_meta, &win_log);
+ 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);
+ init_winconfs(&world);
+ init_wins(&world);
+ set_cleanup_flag(CLEANUP_WINCONFS);
+ sorted_wintoggle_and_activate(&world);
+ err_winmem = "Trouble with draw_all_wins() in main().";
/* Replay mode. */
int key;
- uint8_t quit_called = 0;
- uint8_t await_actions = 1;
+ struct WinConf * wc;
if (0 == world.interactive)
{
- int action;
- while (1)
+ int action = 0;
+ if (0 != start_turn)
{
- if (start_turn == world.turn)
+ while (world.turn != start_turn)
{
- start_turn = 0;
+ action = getc(file);
+ if (EOF == action)
+ {
+ break;
+ }
+ record_control(action, &world);
}
- if (0 == start_turn)
+ }
+ while (1)
+ {
+ draw_all_wins(world.wmeta);
+ 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)))
{
- exit_err(draw_all_wins(&win_meta), &world, err_winmem);
- key = getch();
+ continue;
}
- if (1 == await_actions
- && (world.turn < start_turn
- || key == get_action_key(world.keybindings,
- "wait / next turn")) )
+ if ( EOF != action
+ && key == get_available_keycode_to_action(&world, "wait"))
{
action = getc(file);
- if (EOF == action)
- {
- start_turn = 0;
- await_actions = 0;
- }
- else if (0 == action)
- {
- player_wait (&world);
- }
- else if (NORTH == action)
+ if (EOF != action)
{
- move_player(&world, NORTH);
- }
- else if (EAST == action)
- {
- move_player(&world, EAST);
- }
- else if (SOUTH == action)
- {
- move_player(&world, SOUTH);
- }
- else if (WEST == action)
- {
- move_player(&world, WEST);
+ record_control(action, &world);
}
}
- else
+ else if (meta_control(key, &world))
{
- quit_called = meta_keys(key, &world, &win_meta, &win_keys,
- &win_map, &win_info, &win_log);
- if (1 == quit_called)
- {
- err_c = "Trouble closing 'record' file (fclose() in "
- "main()).";
- exit_err(fclose(file), &world, err_c);
- exit_game(&world);
- }
+ try_fclose(file, &world, f_name);
+ exit_game(&world);
}
}
}
@@ -276,58 +235,31 @@ int main(int argc, char *argv[])
/* Interactive mode. */
else
{
- uint32_t last_turn = 0;
while (1)
{
- if (last_turn != world.turn)
- {
- save_game(&world);
- last_turn = world.turn;
- }
- if (1 == await_actions && 0 == player.hitpoints)
- {
- await_actions = 0;
- }
- draw_all_wins (&win_meta);
+ save_game(&world);
+ draw_all_wins(world.wmeta);
key = getch();
- if (1 == await_actions
- && key == get_action_key(world.keybindings,
- "player up"))
- {
- move_player(&world, NORTH);
- }
- else if (1 == await_actions
- && key == get_action_key(world.keybindings,
- "player right"))
+ wc = get_winconf_by_win(&world, world.wmeta->active);
+ if (1 == wc->view && wingeom_control(key, &world))
{
- move_player(&world, EAST);
+ continue;
}
- else if (1 == await_actions
- && key == get_action_key(world.keybindings,
- "player down"))
+ else if (2 == wc->view && winkeyb_control(key, &world))
{
- move_player(&world, SOUTH);
+ continue;
}
- else if (1 == await_actions
- && key == get_action_key(world.keybindings,
- "player left"))
- {
- move_player(&world, WEST);
- }
- else if (1 == await_actions
- && key == get_action_key(world.keybindings,
- "wait / next turn"))
+
+ if ( (1 == wc->view && wingeom_control(key, &world))
+ || (2 == wc->view && winkeyb_control(key, &world))
+ || (0 != player.hitpoints && player_control(key, &world)))
{
- player_wait (&world);
+ continue;
}
- else
+
+ if (meta_control(key, &world))
{
- quit_called = meta_keys(key, &world, &win_meta, &win_keys,
- &win_map, &win_info, &win_log);
- if (1 == quit_called)
- {
- exit_game(&world);
- }
+ exit_game(&world);
}
}
}