X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=roguelike.c;h=8235d7c1ad7aa1eeac1ee0d63bd1b68affc361b9;hb=a470e49ace2874380e6018a6166dd2a61e3c689c;hp=396f1f6afa8fabcc3309d1503cf09a500e90f5bb;hpb=705543203cfdd050e05c710d6daa1ff642668aa9;p=plomrogue

diff --git a/roguelike.c b/roguelike.c
index 396f1f6..8235d7c 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -1,177 +1,9 @@
 #include <ncurses.h>
 #include <string.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include "windows.h"
-
-struct World {
-  struct KeyBinding * keybindings;
-  struct KeysWinData * keyswindata;
-  int turn;
-  char * log;
-  struct Map * map;
-  struct Player * player; };
-
-struct KeyBinding {
-  char * name;
-  int key; };
-
-struct KeysWinData {
-  int max;
-  char edit;
-  int select; };
-
-struct Map {
-  int width;
-  int height;
-  int offset_x;
-  int offset_y;
-  char * cells; };
-
-struct Player {
-  int y;
-  int x; };
-
-void draw_with_linebreaks (struct Win *, char *, int);
-void draw_text_from_bottom (struct Win *, char *);
-void draw_log (struct Win *);
-void draw_map (struct Win *);
-void draw_info (struct Win *);
-void draw_keys_window (struct Win *);
-void toggle_window (struct WinMeta *, struct Win *);
-void init_keybindings(struct World *);
-struct Map init_map ();
-void update_info (struct World *);
-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.
-  int x, y;
-  char toggle;
-  char fin = 0;
-  int z = -1;
-  for (y = start_y; y < win->height; y++) {
-    if (0 == fin)
-      toggle = 0;
-    for (x = 0; x < win->width; x++) {
-       if (0 == toggle) {
-         z++;
-         if ('\n' == text[z]) {
-           toggle = 1;
-           continue; }
-         else
-           mvwaddch(win->curses, y, x, text[z]);
-         if ('\n' == text[z+1]) {
-           z++;
-           toggle = 1; }
-         else if (0 == text[z+1]) {
-            toggle = 1;
-            fin = 1; } } } } }
-
-void draw_text_from_bottom (struct Win * win, char * text) {
-// Draw text from end/bottom to the top.
-  char toggle = 0;
-  int x, y, offset;
-  int z = -1;
-  for (y = 0; 0 == toggle; y++)                           // Determine number of lines text would have in
-    for (x = 0; x < win->width; x++) {                    // a window of available width, but infinite height.
-      z++;
-      if ('\n' == text[z])            // Treat \n and \0 as control characters for incrementing y and stopping
-        break;                        // the loop. Make sure they don't count as cell space themselves.
-      if ('\n' == text[z+1]) {
-        z++;
-        break; }
-      else if (0 == text[z+1]) {
-        toggle = 1;
-        break; } }
-  z = -1;
-  int start_y = 0;
-  if (y < win->height)             // Depending on what is bigger, determine start point in window or in text.
-    start_y = win->height - y;
-  else if (y > win->height) {
-    offset = y - win->height;
-    for (y = 0; y < offset; y++)
-      for (x = 0; x < win->width; x++) {
-        z++;
-        if ('\n' == text[z])
-          break;
-        if ('\n' == text[z+1]) {
-          z++;
-          break; } }
-    text = text + (sizeof(char) * (z + 1)); }
-  draw_with_linebreaks(win, text, start_y); }
-
-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); }
-
-void draw_map (struct Win * win) {
-// Draw map determined by win->data Map struct into window. Respect offset.
-  struct World * world = (struct World *) win->data;
-  struct Map * map = world->map;
-  struct Player * player = world->player;
-  char * cells = map->cells;
-  int width_map_av = map->width - map->offset_x;
-  int height_map_av = map->height - map->offset_y;
-  int x, y, z;
-  for (y = 0; y < win->height; y++) {
-    z = map->offset_x + (map->offset_y + y) * (map->width);
-    for (x = 0; x < win->width; x++) {
-      if (y < height_map_av && x < width_map_av) {
-        if (z == (map->width * player->y) + player->x)
-          mvwaddch(win->curses, y, x, '@');
-        else
-          mvwaddch(win->curses, y, x, cells[z]);
-        z++; } } } }
-
-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;
-  char text[100];
-  snprintf(text, 100, "Turn: %d", count);
-  draw_with_linebreaks(win, text, 0); }
-
-void draw_keys_window (struct Win * win) {
-// Draw keybinding window.
-  struct World * world = (struct World *) win->data;
-  struct KeysWinData * keyswindata = (struct KeysWinData *) world->keyswindata;
-  struct KeyBinding * keybindings = world->keybindings;
-  int offset = 0;
-  if (keyswindata->max >= win->height) {
-    if (keyswindata->select > win->height / 2) {
-      if (keyswindata->select < (keyswindata->max - (win->height / 2)))
-        offset = keyswindata->select - (win->height / 2);
-      else
-        offset = keyswindata->max - win->height + 1; } }
-  int keydescwidth = 9 + 1; // max length assured by get_keyname() + \0
-  char * keydesc = malloc(keydescwidth);
-  attr_t attri;
-  int y, x;
-  char * keyname;
-  for (y = 0; y <= keyswindata->max && y < win->height; y++) {
-    attri = 0;
-    if (y == keyswindata->select - offset) {
-      attri = A_REVERSE;
-      if (1 == keyswindata->edit)
-        attri = attri | A_BLINK; }
-    keyname = get_keyname(keybindings[y + offset].key);
-    snprintf(keydesc, keydescwidth, "%-9s", keyname);
-    free(keyname);
-    for (x = 0; x < win->width; x++)
-      if (x < strlen(keydesc))
-        mvwaddch(win->curses, y, x, keydesc[x] | attri);
-      else if (strlen(keydesc) < x && x < strlen(keybindings[y + offset].name) + strlen(keydesc) + 1)
-        mvwaddch(win->curses, y, x, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri);
-      else
-        mvwaddch(win->curses, y, x, ' ' | attri); }
-  free(keydesc); }
+#include "draw_wins.h"
+#include "roguelike.h"
 
 void toggle_window (struct WinMeta * win_meta, struct Win * win) {
 // Toggle display of window win.
@@ -180,6 +12,21 @@ void toggle_window (struct WinMeta * win_meta, struct Win * win) {
   else
     append_window(win_meta, win); }
 
+void growshrink_active_window (struct WinMeta * win_meta, char change) {
+// Grow or shrink active window horizontally or vertically by one cell size.
+  if (0 != win_meta->active) {
+    int height = win_meta->active->height;
+    int width = win_meta->active->width;
+    if      (change == '-')
+      height--;
+    else if (change == '+')
+      height++;
+    else if (change == '_')
+      width--;
+    else if (change == '*')
+      width++;
+    resize_active_window (win_meta, height, width); } }
+
 void init_keybindings(struct World * world) {
 // Initialize keybindings from file "keybindings".
   FILE * file = fopen("keybindings", "r");
@@ -238,9 +85,36 @@ struct Map init_map () {
       map.cells[(y * map.width) + x] = terrain; }
   return map; }
 
-void update_info (struct World * world) {
-// Update info data by incrementing turn value.
-  world->turn++; }
+void map_scroll (struct Map * map, char dir) {
+// Scroll map into direction dir if possible by changing the offset.
+  if      ('n' == dir && map->offset_y > 0)
+    map->offset_y--;
+  else if ('s' == dir)
+    map->offset_y++;
+  else if ('w' == dir && map->offset_x > 0)
+    map->offset_x--;
+  else if ('e' == dir)
+    map->offset_x++; }
+
+void next_turn (struct World * world) {
+// Increment turn and move enemy.
+  world->turn++;
+  char d = rand() % 5;
+  char ty = world->monster->y;
+  char tx = world->monster->x;
+  if (1 == d)
+    ty++;
+  else if (2 == d)
+    ty--;
+  else if (3 == d)
+    tx++;
+  else if (4 == d)
+    tx--;
+  if (tx == world->player->x && ty == world->player->y)
+    update_log(world, "\nThe monster hits you.");
+  else if (is_passable(world, tx, ty)) {
+    world->monster->y = ty;
+    world->monster->x = tx; } }
 
 void update_log (struct World * world, char * text) {
 // Update log with new text to be appended.
@@ -322,6 +196,22 @@ char * get_keyname(int keycode) {
     sprintf(keyname, "(unknown)");
   return keyname;  }
 
+void keyswin_mod_key (struct World * world, struct WinMeta * win_meta) {
+// In keybindings window, mark selection modifiable, modify key. Ensure max of three digits in key code field.
+  world->keyswindata->edit = 1;
+  draw_all_windows (win_meta);
+  int key = getch();
+  if (key < 1000)
+    world->keybindings[world->keyswindata->select].key = key;
+  world->keyswindata->edit = 0; }
+
+void keyswin_move_selection (struct World * world, char dir) {
+// In keybindings window, move selection upwards or downwards (if within limits of list length).
+  if ('u' == dir && world->keyswindata->select > 0)
+    world->keyswindata->select--;
+  else if ('d' == dir && world->keyswindata->select < world->keyswindata->max)
+    world->keyswindata->select++; }
+
 char is_passable (struct World * world, int x, int y) {
 // Check if coordinate on (or beyond) map is accessible to movement.
   char passable = 0;
@@ -335,38 +225,46 @@ void move_player (struct World * world, char d) {
   static char prev = 0;
   char success = 0;
   char * dir;
+  char ty = world->player->y;
+  char tx = world->player->x;
   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) {
+    ty++; }
+  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) {
+    ty--; }
+  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) {
+    tx--; }
+  if ('e' == d) {
     dir = "east";
-    if (is_passable(world, world->player->x + 1, world->player->y)) {
-      world->player->x++;
-      success = 1; } }
+    tx++; }
+  if (ty == world->monster->y && tx == world->monster->x)
+    success = 2;
+  else if (is_passable(world, tx, ty)) {
+    success = 1;
+    world->player->y = ty;
+    world->player->x = tx; }
   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); }
+    if (2 == success)
+      update_log (world, "\nYou hit the monster.");
+    else {
+      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;
-  update_info (world); }
+  next_turn (world); }
+
+void player_wait(struct World * world) {
+// Make player wait one turn.
+  next_turn (world);
+  update_log (world, "\nYou wait."); }
 
 int main () {
   struct World world;
@@ -377,9 +275,13 @@ int main () {
   struct Map map = init_map();
   world.map = &map;
   struct Player player;
-  player.y = 10;
-  player.x = 10;
+  player.y = 16;
+  player.x = 16;
   world.player = &player;
+  struct Monster monster;
+  monster.y = 16;
+  monster.x = 80;
+  world.monster = &monster;
 
   WINDOW * screen = initscr();
   noecho();
@@ -387,19 +289,10 @@ int main () {
   keypad(screen, TRUE);
   raw();
   struct WinMeta win_meta = init_win_meta(screen);
-
-  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;
+  struct Win win_keys = init_window(&win_meta, "Keys", &world, draw_keys_win);
+  struct Win win_map = init_window(&win_meta, "Map", &world, draw_map_win);
+  struct Win win_info = init_window(&win_meta, "Info", &world, draw_info_win);
+  struct Win win_log = init_window(&win_meta, "Log", &world, draw_log_win);
 
   int key;
   while (1) {
@@ -408,9 +301,9 @@ int main () {
     if      (key == get_action_key(world.keybindings, "quit"))
       break;
     else if (key == get_action_key(world.keybindings, "scroll pad right"))
-      win_meta.pad_offset++;
-    else if (key == get_action_key(world.keybindings, "scroll pad left") && win_meta.pad_offset > 0)
-      win_meta.pad_offset--;
+      scroll_pad (&win_meta, '+');
+    else if (key == get_action_key(world.keybindings, "scroll pad left"))
+      scroll_pad (&win_meta, '-');
     else if (key == get_action_key(world.keybindings, "toggle keys window"))
       toggle_window(&win_meta, &win_keys);
     else if (key == get_action_key(world.keybindings, "toggle map window"))
@@ -419,43 +312,38 @@ int main () {
       toggle_window(&win_meta, &win_info);
     else if (key == get_action_key(world.keybindings, "toggle log window"))
       toggle_window(&win_meta, &win_log);
-    else if (key == get_action_key(world.keybindings, "cycle forwards") && win_meta.active != 0)
+    else if (key == get_action_key(world.keybindings, "cycle forwards"))
       cycle_active_window(&win_meta, 'n');
-    else if (key == get_action_key(world.keybindings, "cycle backwards") && win_meta.active != 0)
+    else if (key == get_action_key(world.keybindings, "cycle backwards"))
       cycle_active_window(&win_meta, 'p');
-    else if (key == get_action_key(world.keybindings, "shift forwards")  && win_meta.active != 0)
-      shift_window(&win_meta, 'f');
-    else if (key == get_action_key(world.keybindings, "shift backwards") && win_meta.active != 0)
-      shift_window(&win_meta, 'b');
-    else if (key == get_action_key(world.keybindings, "grow horizontally") && win_meta.active != 0)
-      resize_window(&win_meta, '*');
-    else if (key == get_action_key(world.keybindings, "shrink horizontally") && win_meta.active != 0)
-      resize_window(&win_meta, '_');
-    else if (key == get_action_key(world.keybindings, "grow vertically") && win_meta.active != 0)
-      resize_window(&win_meta, '+');
-    else if (key == get_action_key(world.keybindings, "shrink vertically") && win_meta.active != 0)
-      resize_window(&win_meta, '-');
+    else if (key == get_action_key(world.keybindings, "shift forwards"))
+      shift_active_window(&win_meta, 'f');
+    else if (key == get_action_key(world.keybindings, "shift backwards"))
+      shift_active_window(&win_meta, 'b');
+    else if (key == get_action_key(world.keybindings, "grow horizontally"))
+      growshrink_active_window(&win_meta, '*');
+    else if (key == get_action_key(world.keybindings, "shrink horizontally"))
+      growshrink_active_window(&win_meta, '_');
+    else if (key == get_action_key(world.keybindings, "grow vertically"))
+      growshrink_active_window(&win_meta, '+');
+    else if (key == get_action_key(world.keybindings, "shrink vertically"))
+      growshrink_active_window(&win_meta, '-');
     else if (key == get_action_key(world.keybindings, "save keys"))
       save_keybindings(&world);
-    else if (key == get_action_key(world.keybindings, "keys nav up") && world.keyswindata->select > 0)
-      world.keyswindata->select--;
-    else if (key == get_action_key(world.keybindings, "keys nav down") && world.keyswindata->select < world.keyswindata->max)
-      world.keyswindata->select++;
-    else if (key == get_action_key(world.keybindings, "keys mod")) {
-      world.keyswindata->edit = 1;
-      draw_all_windows (&win_meta);
-      key = getch();
-      if (key < 1000) // ensure maximum of three digits in key code field
-        world.keybindings[world.keyswindata->select].key = key;
-      world.keyswindata->edit = 0; }
-    else if (key == get_action_key(world.keybindings, "map up") && map.offset_y > 0)
-      map.offset_y--;
+    else if (key == get_action_key(world.keybindings, "keys nav up"))
+      keyswin_move_selection (&world, 'u');
+    else if (key == get_action_key(world.keybindings, "keys nav down"))
+      keyswin_move_selection (&world, 'd');
+    else if (key == get_action_key(world.keybindings, "keys mod"))
+      keyswin_mod_key (&world, &win_meta);
+    else if (key == get_action_key(world.keybindings, "map up"))
+      map_scroll (&map, 'n');
     else if (key == get_action_key(world.keybindings, "map down"))
-      map.offset_y++;
+      map_scroll (&map, 's');
     else if (key == get_action_key(world.keybindings, "map right"))
-      map.offset_x++;
-    else if (key == get_action_key(world.keybindings, "map left") && map.offset_x > 0)
-      map.offset_x--;
+      map_scroll (&map, 'e');
+    else if (key == get_action_key(world.keybindings, "map left"))
+      map_scroll (&map, 'w');
     else if (key == get_action_key(world.keybindings, "player down"))
       move_player(&world, 's');
     else if (key == get_action_key(world.keybindings, "player up"))
@@ -464,9 +352,8 @@ int main () {
       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."); } }
+    else if (key == get_action_key(world.keybindings, "wait") )
+      player_wait (&world); }
 
   free(map.cells);
   for (key = 0; key <= world.keyswindata->max; key++)