X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=roguelike.c;h=fc5ce007be5e4865e7b79915f52f050c66602c9c;hb=849f93dcd5195f5237bdf8324bfbac2fbf2d611c;hp=4bc6f74f6ef2ada3da10759d5361502128fd81b3;hpb=de5e703e644f824d7d688e64def1afb554675b13;p=plomrogue

diff --git a/roguelike.c b/roguelike.c
index 4bc6f74..fc5ce00 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -46,6 +46,8 @@ void update_log (struct World *, char *);
 void save_keybindings(struct World *);
 int get_action_key (struct KeyBinding *, char *);
 char * get_keyname(int);
+char is_passable (struct World *, int, int);
+void move_player (struct World *, char);
 
 void draw_with_linebreaks (struct Win * win, char * text, int start_y) {
 // Write text into window content space. Start on row start_y. Fill unused rows with whitespace.
@@ -106,8 +108,8 @@ void draw_text_from_bottom (struct Win * win, char * text) {
 
 void draw_log (struct Win * win) {
 // Draw log text from world struct in win->data from bottom to top.
-  struct World world = * (struct World *) win->data;
-  draw_text_from_bottom(win, world.log); }
+  struct World * world = (struct World *) win->data;
+  draw_text_from_bottom(win, world->log); }
 
 void draw_map (struct Win * win) {
 // Draw map determined by win->data Map struct into window. Respect offset.
@@ -130,8 +132,8 @@ void draw_map (struct Win * win) {
 
 void draw_info (struct Win * win) {
 // Draw info window by appending win->data integer value to "Turn: " display.
-  struct World world = * (struct World *) win->data;
-  int count = world.turn;
+  struct World * world = (struct World *) win->data;
+  int count = world->turn;
   char text[100];
   snprintf(text, 100, "Turn: %d", count);
   draw_with_linebreaks(win, text, 0); }
@@ -315,6 +317,52 @@ char * get_keyname(int keycode) {
     sprintf(keyname, "(unknown)");
   return keyname;  }
 
+char is_passable (struct World * world, int x, int y) {
+// Check if coordinate on (or beyond) map is accessible to movement.
+  char passable = 0;
+  if (0 <= x && x < world->map->width && 0 <= y && y < world->map->height)
+    if ('.' == world->map->cells[y * world->map->width + x])
+      passable = 1;
+  return passable; }
+
+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;
+  if ('s' == d) {
+    dir = "south";
+    if (is_passable(world, world->player->x, world->player->y + 1)) {
+      world->player->y++;
+      success = 1; } }
+  else if ('n' == d) {
+    dir = "north";
+    if (is_passable(world, world->player->x, world->player->y - 1)) {
+      world->player->y--;
+      success = 1; } }
+  else if ('w' == d) {
+    dir = "west";
+    if (is_passable(world, world->player->x - 1, world->player->y)) {
+      world->player->x--;
+      success = 1; } }
+  else if ('e' == d) {
+    dir = "east";
+    if (is_passable(world, world->player->x + 1, world->player->y)) {
+      world->player->x++;
+      success = 1; } }
+  if (success * d == prev)
+    update_log (world, ".");
+  else {
+  char * msg = calloc(25, sizeof(char));
+    char * msg_content = "You fail to move";
+    if (success)
+      msg_content = "You move";
+    sprintf(msg, "\n%s %s.", msg_content, dir);
+    update_log (world, msg);
+    free(msg); }
+  prev = success * d;
+  update_info (world); }
+
 int main () {
   struct World world;
   init_keybindings(&world);
@@ -338,15 +386,12 @@ int main () {
   struct Win win_keys = init_window(&win_meta, "Keys");
   win_keys.draw = draw_keys_window;
   win_keys.data = &world;
-
   struct Win win_map = init_window(&win_meta, "Map");
   win_map.draw = draw_map;
   win_map.data = &world;
-
   struct Win win_info = init_window(&win_meta, "Info");
   win_info.draw = draw_info;
   win_info.data = &world;
-
   struct Win win_log = init_window(&win_meta, "Log");
   win_log.draw = draw_log;
   win_log.data = &world;
@@ -406,22 +451,14 @@ int main () {
       map.offset_x++;
     else if (key == get_action_key(world.keybindings, "map left") && map.offset_x > 0)
       map.offset_x--;
-    else if (key == get_action_key(world.keybindings, "player down") && player.y < map.height - 1) {
-      update_info (&world);
-      update_log (&world, "\nYou move south.");
-      player.y++; }
-    else if (key == get_action_key(world.keybindings, "player up") && player.y > 0) {
-      update_info (&world);
-      update_log (&world, "\nYou move north.");
-      player.y--; }
-    else if (key == get_action_key(world.keybindings, "player right") && player.x < map.width - 1) {
-      update_info (&world);
-      update_log (&world, "\nYou move east.");
-      player.x++; }
-    else if (key == get_action_key(world.keybindings, "player left") && player.x > 0) {
-      update_info (&world);
-      update_log (&world, "\nYou move west.");
-      player.x--; }
+    else if (key == get_action_key(world.keybindings, "player down"))
+      move_player(&world, 's');
+    else if (key == get_action_key(world.keybindings, "player up"))
+      move_player(&world, 'n');
+    else if (key == get_action_key(world.keybindings, "player right"))
+      move_player(&world, 'e');
+    else if (key == get_action_key(world.keybindings, "player left"))
+      move_player(&world, 'w');
     else if (key == get_action_key(world.keybindings, "wait") ) {
       update_info (&world);
       update_log (&world, "\nYou wait."); } }