Removed buggy log text compression.

[plomrogue] / src / roguelike.c

diff --git a/src/roguelike.c b/src/roguelike.c
index 525a8cfd0576f8f76113f7f36dedec809127022b..dbbcc34ed107de62f317ab14ba204ca876490635 100644 (file)
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -70,14 +70,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;
@@ -132,14 +130,12 @@ void move_monster (struct World * world, struct Monster * monster) {
       break; } }
   if (met_monster)
     update_log (world, "\nMonster hits monster.");
-  else if (0 == met_monster && is_passable(world->map, t.y, t.x))
+  else 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)
@@ -149,34 +145,27 @@ void move_player (struct World * world, char d) {
   if (2 != success && is_passable(world->map, t.y, t.x)) {
     success = 1;
     world->player->pos = t; }
-  if (success * d == prev)
-    update_log (world, ".");
+  if (2 == success)
+    update_log (world, "\nYou hit the monster.");
   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); }
+    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" ;
+    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); }
+  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.