X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmain.c;h=046ef1ad952f3cec1a8a2786a6117ee87cf44ce5;hb=967562b96d9903fc73ee04716dbeb639e18db823;hp=bf0caa9e54442df45ba58887c477aca7fd659dd4;hpb=db346802082f53faf4d49f234c0ba2cf86221d1e;p=plomrogue
diff --git a/src/main.c b/src/main.c
index bf0caa9..046ef1a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,39 +1,42 @@
/* 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 getopt(), optarg */
#include /* for uint16_t, uint32_t */
-#include /* for errno */
#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 init_keybindings(), 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.h" /* for struct Map, init_map() */
-#include "misc.h" /* for update_log(), find_passable_pos(), save_game() */
+#include "misc.h" /* for update_log(), find_passable_pos(), save_game(),
+ * try_calloc(), check_tempfile(), check_xor_files()
+ */
#include "wincontrol.h" /* for create_winconfs(), init_winconfs(), init_wins(),
- * sorted_wintoggle()
+ * sorted_wintoggle_and_activate()
*/
#include "rrand.h" /* for rrand(), rrand_seed() */
-#include "rexit.h" /* for exit_game() */
-#include "control.h" /* for meta_control() */
+#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. */
@@ -45,30 +48,14 @@ int main(int argc, char *argv[])
char * savefile = "savefile";
char * recordfile_tmp = "record_tmp";
char * savefile_tmp = "savefile_tmp";
- 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);
- }
- 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;
@@ -97,7 +84,7 @@ int main(int argc, char *argv[])
/* Initialize log, player, monster/item definitions and monsters/items. */
world.score = 0;
- world.log = calloc(1, sizeof(char));
+ world.log = try_calloc(1, sizeof(char), &world, f_name);
set_cleanup_flag(CLEANUP_LOG);
update_log(&world, " ");
struct Player player;
@@ -109,17 +96,12 @@ int main(int argc, char *argv[])
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)
@@ -132,7 +114,7 @@ int main(int argc, char *argv[])
exit_err(1, &world, err_r);
}
set_cleanup_flag(CLEANUP_MAP_OBJECTS);
- exit_err(fclose(file), &world, err_c);
+ try_fclose(file, &world, f_name);
player.pos.y--;
player.pos.x--;
}
@@ -140,14 +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'.";
+ 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);
}
@@ -158,20 +137,13 @@ int main(int argc, char *argv[])
{
world.seed = time(NULL);
- 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);
}
}
@@ -202,21 +174,22 @@ 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);
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);
+ set_cleanup_flag(CLEANUP_WINCONFS);
+ sorted_wintoggle_and_activate(&world);
err_winmem = "Trouble with draw_all_wins() in main().";
/* Replay mode. */
int key;
+ struct WinConf * wc;
if (0 == world.interactive)
{
int action = 0;
@@ -236,8 +209,14 @@ int main(int argc, char *argv[])
{
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)))
+ {
+ continue;
+ }
if ( EOF != action
- && key == get_action_key(world.keybindings, "wait"))
+ && key == get_available_keycode_to_action(&world, "wait"))
{
action = getc(file);
if (EOF != action)
@@ -247,8 +226,7 @@ int main(int argc, char *argv[])
}
else if (meta_control(key, &world))
{
- err_c = "Trouble closing 'record' file (fclose() in main()).";
- exit_err(fclose(file), &world, err_c);
+ try_fclose(file, &world, f_name);
exit_game(&world);
}
}
@@ -262,10 +240,23 @@ int main(int argc, char *argv[])
save_game(&world);
draw_all_wins(world.wmeta);
key = getch();
- if (0 != player.hitpoints && 0 == player_control(key, &world))
+ wc = get_winconf_by_win(&world, world.wmeta->active);
+ if (1 == wc->view && wingeom_control(key, &world))
{
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))
{
exit_game(&world);