X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike.c;h=44082d2270f146867e9107aff2e5e04b6e10cb89;hb=2467a76b53f78815d2233d12ba9e896b59db49f5;hp=002b875f9f78c7928c78956d898268dd010fa0c1;hpb=a068b574ce8ac851be5ca1aefbaa487ef6c8e60e;p=plomrogue

diff --git a/roguelike.c b/roguelike.c
index 002b875..44082d2 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -4,14 +4,13 @@
 #include <stdlib.h>
 #include "windows.h"
 
-struct Map {
-  int width;
-  int height;
-  int offset_x;
-  int offset_y;
-  int player_x;
-  int player_y;
-  char * cells; };
+struct World {
+  struct KeyBinding * keybindings;
+  struct KeysWinData * keyswindata;
+  int turn;
+  char * log;
+  struct Map * map;
+  struct Player * player; };
 
 struct KeyBinding {
   char * name;
@@ -22,11 +21,31 @@ struct KeysWinData {
   char edit;
   int select; };
 
-struct World {
-  char * log;
-  int turn;
-  struct KeyBinding * keybindings;
-  struct KeysWinData * keyswindata; };
+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);
 
 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.
@@ -87,21 +106,23 @@ 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.
-  struct Map map = * (struct Map *) win->data;
-  char * cells = map.cells;
-  int width_map_av = map.width - map.offset_x;
-  int height_map_av = map.height - map.offset_y;
+  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);
+    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 * map.player_y) + map.player_x)
+        if (z == (map->width * player->y) + player->x)
           mvwaddch(win->curses, y, x, '@');
         else
           mvwaddch(win->curses, y, x, cells[z]);
@@ -109,12 +130,47 @@ 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); }
 
+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); }
+
 void toggle_window (struct WinMeta * win_meta, struct Win * win) {
 // Toggle display of window win.
   if (0 != win->curses)
@@ -122,6 +178,42 @@ void toggle_window (struct WinMeta * win_meta, struct Win * win) {
   else
     append_window(win_meta, win); }
 
+void init_keybindings(struct World * world) {
+// Initialize keybindings from file "keybindings".
+  FILE * file = fopen("keybindings", "r");
+  int lines = 0;
+  int c = 0;
+  int linemax = 0;
+  int c_count = 0;
+  while (EOF != c) {
+    c_count++;
+    c = getc(file);
+    if ('\n' == c) {
+      if (c_count > linemax)
+        linemax = c_count + 1;
+      c_count = 0;
+      lines++; } }
+  struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding));
+  fseek(file, 0, SEEK_SET);
+  char * command = malloc(linemax);
+  int commcount = 0;
+  char * cmdptr;
+  while (fgets(command, linemax, file)) {
+    keybindings[commcount].key = atoi(command);
+    cmdptr = strchr(command, ' ') + 1;
+    keybindings[commcount].name = malloc(strlen(cmdptr));
+    memcpy(keybindings[commcount].name, cmdptr, strlen(cmdptr) - 1);
+    keybindings[commcount].name[strlen(cmdptr) - 1] = '\0';
+    commcount++; }
+  free(command);
+  fclose(file);
+  struct KeysWinData * keyswindata = malloc(sizeof(struct KeysWinData));
+  keyswindata->max = lines - 1;
+  keyswindata->select = 0;
+  keyswindata->edit = 0;
+  world->keybindings = keybindings;
+  world->keyswindata = keyswindata; }
+
 struct Map init_map () {
 // Initialize map with some experimental start values.
   struct Map map;
@@ -129,8 +221,6 @@ struct Map init_map () {
   map.height = 128;
   map.offset_x = 0;
   map.offset_y = 0;
-  map.player_x = 2;
-  map.player_y = 2;
   map.cells = malloc(map.width * map.height);
   int x, y;
   for (y = 0; y < map.height; y++)
@@ -157,6 +247,24 @@ void update_log (struct World * world, char * text) {
   free(world->log);
   world->log = new_text; }
 
+void save_keybindings(struct World * world) {
+// Write keybindings to keybindings file.
+  struct KeysWinData * keyswindata = (struct KeysWinData *) world->keyswindata;
+  struct KeyBinding * keybindings = world->keybindings;
+  FILE * file = fopen("keybindings", "w");
+  int linemax = 0;
+  int i;
+  for (i = 0; i <= keyswindata->max; i++)
+    if (strlen(keybindings[i].name) > linemax)
+      linemax = strlen(keybindings[i].name);
+  linemax = linemax + 6;                                // + 6 = + 3 digits + whitespace + newline + null byte
+  char * line = malloc(linemax);
+  for (i = 0; i <= keyswindata->max; i++) {
+    snprintf(line, linemax, "%d %s\n", keybindings[i].key, keybindings[i].name);
+    fwrite(line, sizeof(char), strlen(line), file); }
+  free(line);
+  fclose(file); }
+
 int get_action_key (struct KeyBinding * keybindings, char * name) {
 // Return key matching name in keybindings.
   int i = 0;
@@ -207,98 +315,18 @@ char * get_keyname(int keycode) {
     sprintf(keyname, "(unknown)");
   return keyname;  }
 
-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); }
-
-void init_keybindings(struct World * world) {
-// Initialize keybindings from file "keybindings".
-  FILE * file = fopen("keybindings", "r");
-  int lines = 0;
-  int c = 0;
-  int linemax = 0;
-  int c_count = 0;
-  while (EOF != c) {
-    c_count++;
-    c = getc(file);
-    if ('\n' == c) {
-      if (c_count > linemax)
-        linemax = c_count + 1;
-      c_count = 0;
-      lines++; } }
-  struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding));
-  fseek(file, 0, SEEK_SET);
-  char * command = malloc(linemax);
-  int commcount = 0;
-  char * cmdptr;
-  while (fgets(command, linemax, file)) {
-    keybindings[commcount].key = atoi(command);
-    cmdptr = strchr(command, ' ') + 1;
-    keybindings[commcount].name = malloc(strlen(cmdptr));
-    memcpy(keybindings[commcount].name, cmdptr, strlen(cmdptr) - 1);
-    keybindings[commcount].name[strlen(cmdptr) - 1] = '\0';
-    commcount++; }
-  free(command);
-  fclose(file);
-  struct KeysWinData * keyswindata = malloc(sizeof(struct KeysWinData));
-  keyswindata->max = lines - 1;
-  keyswindata->select = 0;
-  keyswindata->edit = 0;
-  world->keybindings = keybindings;
-  world->keyswindata = keyswindata; }
-
-void save_keybindings(struct World * world) {
-// Write keybindings to keybindings file.
-  struct KeysWinData * keyswindata = (struct KeysWinData *) world->keyswindata;
-  struct KeyBinding * keybindings = world->keybindings;
-  FILE * file = fopen("keybindings", "w");
-  int linemax = 0;
-  int i;
-  for (i = 0; i <= keyswindata->max; i++)
-    if (strlen(keybindings[i].name) > linemax)
-      linemax = strlen(keybindings[i].name);
-  linemax = linemax + 6; // + 6 = + 3 digits + whitespace + newline + null byte
-  char * line = malloc(linemax);
-  for (i = 0; i <= keyswindata->max; i++) {
-    snprintf(line, linemax, "%d %s\n", keybindings[i].key, keybindings[i].name);
-    fwrite(line, sizeof(char), strlen(line), file); }
-  free(line);
-  fclose(file); }
-
 int main () {
   struct World world;
   init_keybindings(&world);
+  world.turn = 0;
+  world.log = calloc(1, sizeof(char));
+  update_log (&world, "Start!");
+  struct Map map = init_map();
+  world.map = &map;
+  struct Player player;
+  player.y = 2;
+  player.x = 2;
+  world.player = &player;
 
   WINDOW * screen = initscr();
   noecho();
@@ -313,19 +341,15 @@ int main () {
 
   struct Win win_map = init_window(&win_meta, "Map");
   win_map.draw = draw_map;
-  struct Map map = init_map();
-  win_map.data = &map;
+  win_map.data = &world;
 
-  world.turn = 0;
   struct Win win_info = init_window(&win_meta, "Info");
   win_info.draw = draw_info;
   win_info.data = &world;
 
-  world.log = calloc(1, sizeof(char));
   struct Win win_log = init_window(&win_meta, "Log");
   win_log.draw = draw_log;
   win_log.data = &world;
-  update_log (&world, "Start!");
 
   int key;
   while (1) {
@@ -382,22 +406,22 @@ 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") && map.player_y < map.height - 1) {
+    else if (key == get_action_key(world.keybindings, "player down") && player.y < map.height - 1) {
       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) {
+      player.y++; }
+    else if (key == get_action_key(world.keybindings, "player up") && player.y > 0) {
       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) {
+      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.");
-      map.player_x++; }
-    else if (key == get_action_key(world.keybindings, "player left") && map.player_x > 0) {
+      player.x++; }
+    else if (key == get_action_key(world.keybindings, "player left") && player.x > 0) {
       update_info (&world);
       update_log (&world, "\nYou move west.");
-      map.player_x--; }
+      player.x--; }
     else if (key == get_action_key(world.keybindings, "wait") ) {
       update_info (&world);
       update_log (&world, "\nYou wait."); } }