X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Froguelike.c;h=021bfe71e4abb51283c5823fb26136604f5a5b1d;hb=4f8360fb6aad70ba208ca60f0d9c94590b222530;hp=c823482058aee71c5e7039c276f6daaf995cf56b;hpb=3fca9119dd4fa5dabde64961a76422faf828cad0;p=plomrogue

diff --git a/src/roguelike.c b/src/roguelike.c
index c823482..021bfe7 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -9,11 +9,7 @@
 #include "roguelike.h"
 #include "keybindings.h"
 #include "readwrite.h"
-
-#define NORTH 1
-#define EAST 2
-#define SOUTH 3
-#define WEST 4
+#include "actors.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 +66,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;
@@ -99,85 +93,6 @@ void save_game(struct World * world) {
   write_uint16_bigendian(world->monster->next->next->pos.x, file);
   fclose(file); }
 
-char is_passable (struct Map * map, uint16_t y, uint16_t x) {
-// Check if coordinate on (or beyond) map is accessible to movement.
-  char passable = 0;
-  if (0 <= x && x < map->size.x && 0 <= y && y < map->size.y)
-    if ('.' == map->cells[y * map->size.x + 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;
-  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; }
-  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))
-    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); }
-
-void player_wait (struct World * world) {
-// Make player wait one turn.
-  update_log (world, "\nYou wait.");
-  if (1 == world->interactive)
-    record_action(0);
-  next_turn (world); }
-
 void toggle_window (struct WinMeta * win_meta, struct Win * win) {
 // Toggle display of window win.
   if (0 != win->frame.curses_win)