X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmain.c;h=247ec507173c9af85e02d6549926f08e3d5b6db4;hb=24a8edd8a9f5393cf67c1d9a86923f388e43e104;hp=8f13e080bfcde60ac246b7fcb5e5957f530badcb;hpb=caf7e50574dc4fb3756a386257863e5b8b42ad98;p=plomrogue
diff --git a/src/main.c b/src/main.c
index 8f13e08..247ec50 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,8 +5,8 @@
#include /* for FILE typedef, F_OK, rename() */
#include /* for initscr(), noecho(), curs_set(), keypad(), raw() */
#include /* for time() */
-#include /* for unlink(), getopt(), optarg */
-#include /* for uint8_t */
+#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()
@@ -14,26 +14,31 @@
#include "draw_wins.h" /* for draw_keys_win(), draw_map_win(), draw_info_win(),
* draw_log_win()
*/
-#include "keybindings.h" /* for initkeybindings(), get_action_key() */
+#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_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 +50,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 +73,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 +150,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.";
@@ -216,122 +224,58 @@ int main(int argc, char *argv[])
/* 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);
- 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);
- if (1 == quit_called)
- {
- exit_game(&world);
- }
+ exit_game(&world);
}
}
}