X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=roguelike.c;h=d7347261125487598cef36082a5f2c4d2c09c060;hb=3663e5190d818c51d9b8e8107bf3cc713e0ece03;hp=23a686a468ec8e4dc0ad357cfdf66b258451a9c4;hpb=cc54db8c41c3d0e00248422b6dc1a67187cd4e16;p=plomrogue
diff --git a/roguelike.c b/roguelike.c
index 23a686a..d734726 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -173,7 +173,7 @@ char is_passable (struct World * world, uint16_t x, uint16_t y) {
return passable; }
void record_action (char action) {
-//
+// Append action to game record file.
FILE * file = fopen("record", "a");
fputc(action, file);
fclose(file); }
@@ -241,7 +241,7 @@ unsigned char meta_keys(int key, struct World * world, struct WinMeta * win_meta
// Call some meta program / window management actions dependent on key. Return 1 to signal quitting.
if (key == get_action_key(world->keybindings, "quit"))
return 1;
- if (key == get_action_key(world->keybindings, "scroll pad right"))
+ else if (key == get_action_key(world->keybindings, "scroll pad right"))
scroll_pad (win_meta, '+');
else if (key == get_action_key(world->keybindings, "scroll pad left"))
scroll_pad (win_meta, '-');
@@ -345,7 +345,7 @@ int main (int argc, char *argv[]) {
toggle_window(&win_meta, &win_log);
int key;
- unsigned char result;
+ unsigned char quit_called;
if (0 == world.interactive) {
int action;
while (1) {
@@ -366,8 +366,8 @@ int main (int argc, char *argv[]) {
else if ('w' == action)
move_player(&world, 'w'); }
else
- result = meta_keys(key, &world, &win_meta, &win_keys, &win_map, &win_info, &win_log);
- if (1 == result)
+ quit_called = meta_keys(key, &world, &win_meta, &win_keys, &win_map, &win_info, &win_log);
+ if (1 == quit_called)
break; } }
else {
uint32_t last_turn = 0;
@@ -388,8 +388,8 @@ int main (int argc, char *argv[]) {
else if (key == get_action_key(world.keybindings, "wait / next turn"))
player_wait (&world);
else
- result = meta_keys(key, &world, &win_meta, &win_keys, &win_map, &win_info, &win_log);
- if (1 == result)
+ quit_called = meta_keys(key, &world, &win_meta, &win_keys, &win_map, &win_info, &win_log);
+ if (1 == quit_called)
break; } }
free(map.cells);