X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/static/git-logo.png?a=blobdiff_plain;f=src%2Froguelike.c;h=2186348d53c554ce6b7ab964d851fd379a1bccc5;hb=f07cfd3448cb75abc1ae6fbfc9a946b8c4b91f5d;hp=b38c01b2ceb6b786c718bcb8894d0fe8e9623dec;hpb=320b8c4e907fd6be633b68c5c8c7785eadf76b4e;p=plomrogue

diff --git a/src/roguelike.c b/src/roguelike.c
index b38c01b..2186348 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -10,11 +10,6 @@
 #include "keybindings.h"
 #include "readwrite.h"
 
-#define NORTH 1
-#define EAST 2
-#define SOUTH 3
-#define WEST 4
-
 uint16_t rrand(char use_seed, uint32_t new_seed) {
 // Pseudo-random number generator (LGC algorithm). Use instead of rand() to ensure portable predictability.
   static uint32_t seed;
@@ -70,14 +65,12 @@ void map_scroll (struct Map * map, char dir) {
   else if (WEST  == dir && map->offset.x > 0) map->offset.x--;
   else if (EAST  == dir)                      map->offset.x++; }
 
-void record_action (char action) {
-// Append action to game record file.
-  FILE * file = fopen("record", "a");
-  fputc(action, file);
-  fclose(file); }
-
-void next_turn (struct World * world) {
-// Increment turn and move enemy.
+void turn_over (struct World * world, char action) {
+// Record action in game record file, increment turn and move enemy.
+  if (1 == world->interactive) {
+    FILE * file = fopen("record", "a");
+    fputc(action, file);
+    fclose(file); }
   world->turn++;
   rrand(1, world->seed * world->turn);
   struct Monster * monster;
@@ -107,14 +100,6 @@ char is_passable (struct Map * map, uint16_t y, uint16_t x) {
       passable = 1;
   return passable; }
 
-struct yx_uint16 mv_yx_in_dir (char d, struct yx_uint16 yx) {
-// Return yx coordinates one step to the direction d of yx.
-  if      (d == NORTH) yx.y--;
-  else if (d == EAST)  yx.x++;
-  else if (d == SOUTH) yx.y++;
-  else if (d == WEST)  yx.x--;
-  return yx; }
-
 void move_monster (struct World * world, struct Monster * monster) {
 // Move monster in random direction, trigger fighting when hindered by player/monster.
   char d = rrand(0, 0) % 5;
@@ -122,61 +107,44 @@ void move_monster (struct World * world, struct Monster * monster) {
   if (yx_uint16_cmp (t, world->player->pos)) {
     update_log (world, "\nThe monster hits you.");
     return; }
-  char met_monster = 0;
   struct Monster * other_monster;
   for (other_monster = world->monster; other_monster != 0; other_monster = other_monster->next) {
     if (other_monster == monster)
       continue;
     if (yx_uint16_cmp (t, other_monster->pos)) {
-      met_monster = 1;
-      break; } }
-  if (met_monster)
-    update_log (world, "\nMonster hits monster.");
-  else if (is_passable(world->map, t.y, t.x))
+      update_log (world, "\nMonster hits monster.");
+      return; } }
+  if (is_passable(world->map, t.y, t.x))
     monster->pos = t; }
 
 void move_player (struct World * world, char d) {
 // Move player in direction d, increment turn counter and update log.
-  static char prev = 0;
-  char success = 0;
-  char * dir;
   struct yx_uint16 t = mv_yx_in_dir (d, world->player->pos);
   struct Monster * monster;
   for (monster = world->monster; monster != 0; monster = monster->next)
     if (yx_uint16_cmp (t, monster->pos)) {
-      success = 2;
-      break; }
-  if (2 != success && is_passable(world->map, t.y, t.x)) {
-    success = 1;
-    world->player->pos = t; }
-  if (success * d == prev)
-    update_log (world, ".");
-  else {
-    if (2 == success)
       update_log (world, "\nYou hit the monster.");
-    else {
-      if      (NORTH == d) dir = "north";
-      else if (EAST  == d) dir = "east" ;
-      else if (SOUTH == d) dir = "south";
-      else if (WEST  == d) dir = "west" ;
-      char * msg = calloc(25, sizeof(char));
-      char * msg_content = "You fail to move";
-      if (1 == success)
-        msg_content = "You move";
-      sprintf(msg, "\n%s %s.", msg_content, dir);
-      update_log (world, msg);
-      free(msg); } }
-  prev = success * d;
-  if (1 == world->interactive)
-    record_action(d);
-  next_turn (world); }
+      turn_over (world, d);
+      return; }
+  char * msg = calloc(25, sizeof(char));
+  char * msg_content = "You fail to move";
+  char * dir;
+  if      (NORTH == d) dir = "north";
+  else if (EAST  == d) dir = "east" ;
+  else if (SOUTH == d) dir = "south";
+  else if (WEST  == d) dir = "west" ;
+  if (is_passable(world->map, t.y, t.x)) {
+    msg_content = "You move";
+    world->player->pos = t; }
+  sprintf(msg, "\n%s %s.", msg_content, dir);
+  update_log (world, msg);
+  free(msg);
+  turn_over (world, d); }
 
 void player_wait (struct World * world) {
 // Make player wait one turn.
-  if (1 == world->interactive)
-    record_action(0);
-  next_turn (world);
-  update_log (world, "\nYou wait."); }
+  update_log (world, "\nYou wait.");
+  turn_over (world, 0); }
 
 void toggle_window (struct WinMeta * win_meta, struct Win * win) {
 // Toggle display of window win.