X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike.c;h=5203b4b66279fc7010be005331ae1423afbb0d1e;hb=54aa7a81ed47dc6cdc9cc332806a0c1771a1ec3c;hp=5c9ce8876660e96c436b441dbf585db03934c0f3;hpb=1ac0511e51c3f43957f322aa0017ac6afef4ec20;p=plomrogue

diff --git a/roguelike.c b/roguelike.c
index 5c9ce88..5203b4b 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -24,6 +24,8 @@ struct KeysWinData {
   int select; };
 
 struct World {
+  char * log;
+  int turn;
   struct KeyBinding * keybindings;
   struct KeysWinData * keyswindata; };
 
@@ -40,7 +42,6 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) {
        if (0 == toggle) {
          z++;
          if ('\n' == text[z]) {
-           mvwaddch(win->curses_win, y, x, ' ');
            toggle = 1;
            continue; }
          else
@@ -50,13 +51,10 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) {
            toggle = 1; }
          else if (0 == text[z+1]) {
             toggle = 1;
-            fin = 1; } }
-       else
-         mvwaddch(win->curses_win, y, x, ' '); } } }
+            fin = 1; } } } } }
 
-void draw_text_from_bottom (struct Win * win) {
-// Draw text in win->data from end/bottom to the top.
-  char * text = (char *) win->data;
+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;
@@ -73,11 +71,8 @@ void draw_text_from_bottom (struct Win * win) {
         break; } }
   z = -1;
   int start_y = 0;
-  if (y < win->height) {          // Depending on what is bigger, determine start point in window or in text.
+  if (y < win->height)             // Depending on what is bigger, determine start point in window or in text.
     start_y = win->height - y;
-    for (y = 0; y < start_y; y++)
-      for (x = 0; x < win->width; x++)
-        mvwaddch(win->curses_win, y, x, ' '); }
   else if (y > win->height) {
     offset = y - win->height;
     for (y = 0; y < offset; y++)
@@ -91,6 +86,11 @@ void draw_text_from_bottom (struct Win * win) {
     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 Map map = * (struct Map *) win->data;
@@ -106,13 +106,12 @@ void draw_map (struct Win * win) {
           mvwaddch(win->curses_win, y, x, '@');
         else
           mvwaddch(win->curses_win, y, x, cells[z]);
-        z++; }
-      else
-        mvwaddch(win->curses_win, y, x, ' '); } } }
+        z++; } } } }
 
 void draw_info (struct Win * win) {
 // Draw info window by appending win->data integer value to "Turn: " display.
-  int count = * (int *) win->data;
+  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); }
@@ -143,21 +142,21 @@ struct Map init_map () {
   map.cells[(8 * map.width) + 3] = 'X';
   return map; }
 
-void update_info (struct Win * win) {
+void update_info (struct World * world) {
 // Update info data by incrementing turn value.
-  * (int *) win->data = * (int *) win->data + 1; }
+  world->turn++; }
 
-void update_log (struct Win * win, char * text) {
+void update_log (struct World * world, char * text) {
 // Update log with new text to be appended.
   char * new_text;
-  int len_old = strlen(win->data);
+  int len_old = strlen(world->log);
   int len_new = strlen(text);
   int len_whole = len_old + len_new + 1;
   new_text = calloc(len_whole, sizeof(char));
-  memcpy(new_text, win->data, len_old);
+  memcpy(new_text, world->log, len_old);
   memcpy(new_text + len_old, text, len_new);
-  free(win->data);
-  win->data = new_text; }
+  free(world->log);
+  world->log = new_text; }
 
 int get_action_key (struct KeyBinding * keybindings, char * name) {
 // Return key matching name in keybindings.
@@ -216,37 +215,33 @@ void draw_keys_window (struct Win * win) {
   struct KeyBinding * keybindings = world->keybindings;
   int offset = 0;
   if (keyswindata->max >= win->height) {
-    if (keyswindata->select > win->height / 2)
+    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; // max length assured by get_keyname()
-  char * keydesc = malloc(keydescwidth + 1);
+        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; 0 != keybindings[offset + y].name && y < win->height; y++) {
+  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 + 1, "%-9s", keyname);
+    snprintf(keydesc, keydescwidth, "%-9s", keyname);
     free(keyname);
     for (x = 0; x < win->width; x++)
-      if (strlen(keydesc) > x)
+      if (x < strlen(keydesc))
         mvwaddch(win->curses_win, y, x, keydesc[x] | attri);
       else if (strlen(keydesc) < x && x < strlen(keybindings[y + offset].name) + strlen(keydesc) + 1)
         mvwaddch(win->curses_win, y, x, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri);
       else
         mvwaddch(win->curses_win, y, x, ' ' | attri); }
-  free(keydesc);
-  if (y < win->height)
-    for (; y < win->height; y++)
-      for (x = 0; x < win->width; x++)
-        mvwaddch(win->curses_win, y, x, ' '); }
+  free(keydesc); }
 
 void init_keybindings(struct World * world) {
 // Initialize keybindings from file "keybindings".
@@ -266,21 +261,21 @@ void init_keybindings(struct World * world) {
   struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding));
   fseek(file, 0, SEEK_SET);
   char * command = malloc(linemax);
-  char commcount = 0;
+  int commcount = 0;
   char * digits = malloc(3);
-  char digicount = 0;
+  int digicount = 0;
   int key, digimax;
   int keycount = 0;
   c = getc(file);
   while (EOF != c) {
     if ('\n' == c) {
-      keybindings[keycount].name = calloc(commcount, sizeof(char));
+      keybindings[keycount].name = calloc(commcount + 1, sizeof(char));
       memcpy(keybindings[keycount].name, command, commcount);
       keybindings[keycount].key = key;
       keycount++;
       digicount = 0;
       commcount = 0; }
-    else if (-1 != digicount)
+    else if (-1 != digicount) {
       if (' ' == c) {
         key = 0;
         digimax = digicount - 1;
@@ -290,7 +285,7 @@ void init_keybindings(struct World * world) {
         digicount = -1; }
       else {
         digits[digicount] = c;
-        digicount++; }
+        digicount++; } }
     else {
       command[commcount] = c;
       commcount++; }
@@ -343,15 +338,16 @@ int main () {
   struct Map map = init_map();
   win_map.data = &map;
 
+  world.turn = 0;
   struct Win win_info = init_window(&win_meta, "Info");
   win_info.draw = draw_info;
-  win_info.data = malloc(sizeof(int));
-  * (int *) win_info.data = 0;
+  win_info.data = &world;
 
+  world.log = calloc(1, sizeof(char));
   struct Win win_log = init_window(&win_meta, "Log");
-  win_log.draw = draw_text_from_bottom;
-  win_log.data = calloc(1, sizeof(char));
-  update_log (&win_log, "Start!");
+  win_log.draw = draw_log;
+  win_log.data = &world;
+  update_log (&world, "Start!");
 
   int key;
   while (1) {
@@ -409,24 +405,31 @@ int main () {
     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") && map.player_y < map.height - 1) {
-      update_info (&win_info);
-      update_log (&win_log, "\nYou move south.");
+      update_info (&world);
+      update_log (&world, "\nYou move south.");
       map.player_y++; }
     else if (key == get_action_key(world.keybindings, "player up") && map.player_y > 0) {
-      update_info (&win_info);
-      update_log (&win_log, "\nYou move north.");
+      update_info (&world);
+      update_log (&world, "\nYou move north.");
       map.player_y--; }
     else if (key == get_action_key(world.keybindings, "player right") && map.player_x < map.width - 1) {
-      update_info (&win_info);
-      update_log (&win_log, "\nYou move east.");
+      update_info (&world);
+      update_log (&world, "\nYou move east.");
       map.player_x++; }
     else if (key == get_action_key(world.keybindings, "player left") && map.player_x > 0) {
-      update_info (&win_info);
-      update_log (&win_log, "\nYou move west.");
+      update_info (&world);
+      update_log (&world, "\nYou move west.");
       map.player_x--; }
     else if (key == get_action_key(world.keybindings, "wait") ) {
-      update_info (&win_info);
-      update_log (&win_log, "\nYou wait."); } }
+      update_info (&world);
+      update_log (&world, "\nYou wait."); } }
+
+  free(map.cells);
+  for (key = 0; key <= world.keyswindata->max; key++)
+    free(world.keybindings[key].name);
+  free(world.keybindings);
+  free(world.keyswindata);
+  free(world.log);
 
   endwin();
   return 0; }