From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 3 Jul 2013 01:47:43 +0000 (+0200)
Subject: Reworked "actors" library as more inclusive "objects_on_map".
X-Git-Tag: tce~1172
X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=22f0a5223adddd1d6e1ea8f6f521279906b35ecd;p=plomrogue

Reworked "actors" library as more inclusive "objects_on_map".
---

diff --git a/src/actors.c b/src/actors.c
deleted file mode 100644
index ca1305c..0000000
--- a/src/actors.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "actors.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include "yx_uint16.h"
-#include "roguelike.h"
-
-extern char is_passable (struct Map * map, struct yx_uint16 pos) {
-// Check if coordinate on (or beyond) map is accessible to actor movement.
-  char passable = 0;
-  if (0 <= pos.x && pos.x < map->size.x && 0 <= pos.y && pos.y < map->size.y)
-    if ('.' == map->cells[pos.y * map->size.x + pos.x])
-      passable = 1;
-  return passable; }
-
-extern 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;
-  struct yx_uint16 t = mv_yx_in_dir (d, monster->pos);
-  if (yx_uint16_cmp (t, world->player->pos)) {
-    update_log (world, "\nThe monster hits you.");
-    return; }
-  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)) {
-      update_log (world, "\nMonster hits monster.");
-      return; } }
-  if (is_passable(world->map, t))
-    monster->pos = t; }
-
-extern void move_player (struct World * world, char d) {
-// Move player in direction d, update log and turn over to the enemy.
-  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)) {
-      update_log (world, "\nYou hit the monster.");
-      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)) {
-    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); }
-
-extern void player_wait (struct World * world) {
-// Make player wait one turn.
-  update_log (world, "\nYou wait.");
-  turn_over (world, 0); }
diff --git a/src/actors.h b/src/actors.h
deleted file mode 100644
index d88c66f..0000000
--- a/src/actors.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef ACTORS_H
-#define ACTORS_H
-
-#include "yx_uint16.h"
-
-struct World;
-struct Map;
-
-struct Player {
-  struct yx_uint16 pos; };
-
-struct Monster {
-  struct Monster * next;
-  char name;
-  struct yx_uint16 pos; };
-
-extern char is_passable (struct Map *, struct yx_uint16);
-extern void move_monster (struct World *, struct Monster *);
-extern void move_player (struct World *, char);
-extern void player_wait(struct World *);
-
-#endif
diff --git a/src/draw_wins.c b/src/draw_wins.c
index 5b60d81..9c53810 100644
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -6,7 +6,7 @@
 #include "windows.h"
 #include "roguelike.h"
 #include "keybindings.h"
-#include "actors.h"
+#include "objects_on_map.h"
 
 void draw_with_linebreaks (struct Win * win, char * text, uint16_t start_y) {
 // Write text into window content space. Start on row start_y. Fill unused rows with whitespace.
diff --git a/src/objects_on_map.c b/src/objects_on_map.c
new file mode 100644
index 0000000..eedf800
--- /dev/null
+++ b/src/objects_on_map.c
@@ -0,0 +1,67 @@
+#include "objects_on_map.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include "yx_uint16.h"
+#include "roguelike.h"
+
+extern char is_passable (struct Map * map, struct yx_uint16 pos) {
+// Check if coordinate on (or beyond) map is accessible to actor movement.
+  char passable = 0;
+  if (0 <= pos.x && pos.x < map->size.x && 0 <= pos.y && pos.y < map->size.y)
+    if ('.' == map->cells[pos.y * map->size.x + pos.x])
+      passable = 1;
+  return passable; }
+
+extern struct yx_uint16 find_passable_pos (struct Map * map) {
+// Return a random passable position on map.
+  struct yx_uint16 pos;
+  for (pos.y = pos.x = 0; 0 == is_passable(map, pos);) {
+      pos.y = rrand(0, 0) % map->size.y;
+      pos.x = rrand(0, 0) % map->size.x; }
+  return pos; }
+
+extern 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;
+  struct yx_uint16 t = mv_yx_in_dir (d, monster->pos);
+  if (yx_uint16_cmp (t, world->player->pos)) {
+    update_log (world, "\nThe monster hits you.");
+    return; }
+  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)) {
+      update_log (world, "\nMonster hits monster.");
+      return; } }
+  if (is_passable(world->map, t))
+    monster->pos = t; }
+
+extern void move_player (struct World * world, char d) {
+// Move player in direction d, update log and turn over to the enemy.
+  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)) {
+      update_log (world, "\nYou hit the monster.");
+      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)) {
+    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); }
+
+extern void player_wait (struct World * world) {
+// Make player wait one turn.
+  update_log (world, "\nYou wait.");
+  turn_over (world, 0); }
diff --git a/src/objects_on_map.h b/src/objects_on_map.h
new file mode 100644
index 0000000..ac3795d
--- /dev/null
+++ b/src/objects_on_map.h
@@ -0,0 +1,28 @@
+#ifndef ACTORS_H
+#define ACTORS_H
+
+#include "yx_uint16.h"
+
+struct World;
+struct Map;
+
+struct Player {
+  struct yx_uint16 pos; };
+
+struct Item {
+  struct Item * next;
+  char name;
+  struct yx_uint16 pos; };
+
+struct Monster {
+  struct Monster * next;
+  char name;
+  struct yx_uint16 pos; };
+
+extern char is_passable (struct Map *, struct yx_uint16);
+extern struct yx_uint16 find_passable_pos (struct Map *);
+extern void move_monster (struct World *, struct Monster *);
+extern void move_player (struct World *, char);
+extern void player_wait(struct World *);
+
+#endif
diff --git a/src/roguelike.c b/src/roguelike.c
index 68a5936..ac735ac 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -9,7 +9,7 @@
 #include "draw_wins.h"
 #include "keybindings.h"
 #include "readwrite.h"
-#include "actors.h"
+#include "objects_on_map.h"
 
 uint16_t rrand(char use_seed, uint32_t new_seed) {
 // Pseudo-random number generator (LGC algorithm). Use instead of rand() to ensure portable predictability.
@@ -70,14 +70,6 @@ struct Map init_map () {
       map.cells[y * map.size.x + x] = '.'; }
   return map; }
 
-struct yx_uint16 find_passable_pos (struct Map * map) {
-// Return a random passable position on map.
-  struct yx_uint16 pos;
-  for (pos.y = pos.x = 0; 0 == is_passable(map, pos);) {
-      pos.y = rrand(0, 0) % map->size.y;
-      pos.x = rrand(0, 0) % map->size.x; }
-  return pos; }
-
 void map_scroll (struct Map * map, char dir) {
 // Scroll map into direction dir if possible by changing the offset.
   if      (NORTH == dir && map->offset.y > 0) map->offset.y--;
diff --git a/src/roguelike.h b/src/roguelike.h
index 5041caf..14ca783 100644
--- a/src/roguelike.h
+++ b/src/roguelike.h
@@ -26,16 +26,10 @@ struct Map {
   struct yx_uint16 offset;
   char * cells; };
 
-struct Item {
-  struct Item * next;
-  char name;
-  struct yx_uint16 pos; };
-
 extern uint16_t rrand(char, uint32_t);
 extern void update_log (struct World *, char *);
 
 extern struct Map init_map ();
-extern struct yx_uint16 find_passable_pos (struct Map *);
 extern void map_scroll (struct Map *, char);
 
 extern void turn_over (struct World *, char);