X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmain.c;h=dff5d208414e02ea3749a85b96980de8dccfe37e;hb=4ca4f2fc97bd592bcbbef5ed2b21b320c7336425;hp=1f9d7f7b89c01ee591f8ce911433f9238f323be8;hpb=b392e7b60ee954f1a8476d2cd2d92538b1873b2f;p=plomrogue
diff --git a/src/main.c b/src/main.c
index 1f9d7f7..dff5d20 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,17 +23,23 @@
#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()
+ * save_game()
*/
#include "yx_uint16.h" /* for dir enum */
#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;
+
+ /* Check for corrupted savefile / recordfile savings. */
char * recordfile = "record";
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.";
@@ -45,14 +51,11 @@ int main(int argc, char *argv[])
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.";
@@ -71,17 +74,24 @@ 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.score = 0;
world.log = calloc(1, sizeof(char));
set_cleanup_flag(CLEANUP_LOG);
update_log (&world, " ");
@@ -141,7 +151,6 @@ 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.";
@@ -189,145 +198,85 @@ int main(int argc, char *argv[])
init_keybindings(&world);
set_cleanup_flag(CLEANUP_KEYBINDINGS);
struct WinMeta win_meta;
- char * err_winmem = "Trouble with init_win() or draw_all_wins() in main().";
+ 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;
struct Win win_keys = init_win(&win_meta, "Keys",
- 0, 29, &world, draw_keys_win);
+ 0, 29, &world, draw_keys_win);
+ world.wins.keys = &win_keys;
struct Win win_info = init_win(&win_meta, "Info",
3, 20, &world, draw_info_win);
+ world.wins.info = &win_info;
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);
+ world.wins.log = &win_log;
uint16_t width_mapwin = win_meta.padframe.size.x - win_keys.frame.size.x
- - win_log.frame.size.x - 2;
+ - 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);
+ world.wins.map = &win_map;
+ toggle_window(&win_meta, world.wins.keys);
+ toggle_window(&win_meta, world.wins.map);
+ toggle_window(&win_meta, world.wins.info);
+ toggle_window(&win_meta, world.wins.log);
/* Replay mode. */
int key;
- uint8_t quit_called = 0;
- uint8_t await_actions = 1;
if (0 == world.interactive)
{
- int action;
- while (1)
+ int action = 0;
+ if (0 != start_turn)
{
- if (start_turn == world.turn)
- {
- start_turn = 0;
- }
- if (0 == start_turn)
- {
- exit_err(draw_all_wins(&win_meta), &world, err_winmem);
- key = getch();
- }
- if (1 == await_actions
- && (world.turn < start_turn
- || key == get_action_key(world.keybindings,
- "wait / next turn")) )
+ while (world.turn != start_turn)
{
action = getc(file);
if (EOF == action)
{
- start_turn = 0;
- await_actions = 0;
- }
- else if (0 == action)
- {
- player_wait (&world);
- }
- else if (NORTH == 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);
+ break;
}
+ record_control(action, &world);
}
- else
+ }
+ while (1)
+ {
+ draw_all_wins(&win_meta);
+ key = getch();
+ if ( EOF != action
+ && key == get_action_key(world.keybindings, "wait / next turn"))
{
- quit_called = meta_keys(key, &world, &win_meta, &win_keys,
- &win_map, &win_info, &win_log);
- if (1 == quit_called)
+ action = getc(file);
+ if (EOF != action)
{
- err_c = "Trouble closing 'record' file (fclose() in "
- "main()).";
- exit_err(fclose(file), &world, err_c);
- exit_game(&world);
+ record_control(action, &world);
}
}
+ else if (meta_control(key, &world))
+ {
+ err_c = "Trouble closing 'record' file (fclose() in main()).";
+ exit_err(fclose(file), &world, err_c);
+ exit_game(&world);
+ }
}
}
/* 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(&win_meta);
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"))
- {
- move_player(&world, EAST);
- }
- else if (1 == await_actions
- && key == get_action_key(world.keybindings,
- "player down"))
+ if (0 != player.hitpoints && 0 == player_control(key, &world))
{
- move_player(&world, SOUTH);
+ continue;
}
- else if (1 == await_actions
- && key == get_action_key(world.keybindings,
- "player left"))
+ if (meta_control(key, &world))
{
- move_player(&world, WEST);
- }
- else if (1 == await_actions
- && key == get_action_key(world.keybindings,
- "wait / next turn"))
- {
- player_wait (&world);
- }
- else
- {
- 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);
}
}
}