X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=69278e8393631a351326ae725e682a304a267ab7;hb=0438f2fc5df337e4264103a86c1765ace9c6565a;hp=ed7815e8aac2f4357bb260436855a26fc40177fc;hpb=8c682e4dff60612ad29651ba1006cbc5fe911c6a;p=plomrogue
diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index ed7815e..69278e8 100644
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -1,5 +1,6 @@
/* src/client/draw_wins.c */
+#define _POSIX_C_SOURCE 200809L /* strdup() */
#include "draw_wins.h"
#include /* typedefs attr_t, chtype, define A_REVERSE */
#include /* NULL */
@@ -9,9 +10,8 @@
#include /* memset(), strchr(), strdup/(), strlen() */
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
-#include "../common/yx_uint16.h" /* struct yx_uint16 */
#include "keybindings.h" /* struct KeyBindingDB, get_keyname_to_keycode() */
-#include "windows.h" /* struct Win, get_win_by_id() */
+#include "windows.h" /* yx_uint16, Win, get_win_by_id() */
#include "world.h" /* global world */
@@ -185,7 +185,8 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri,
uint32_t len_line_new = len_line + strlen(separator);
char line_new[len_line_new];
sprintf(line_new, "%s%s", line, separator);
- uint16_t x, y;
+ uint16_t x = 0;
+ uint16_t y;
uint32_t z;
for (z = 0, y = y_start; z < len_line_new; y++)
{
@@ -203,7 +204,7 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri,
try_resize_winmap(win, y + 1 + 1, win->winmap_size.x);
}
}
- * offset = x;
+ *offset = x;
}
@@ -275,7 +276,7 @@ static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb,
add_line(win, "(none)", 0, &offset, 0);
return;
}
- uint16_t kb_n;
+ uint8_t kb_n;
for (kb_n = 0; kb_n < kbdb->n_of_kbs; kb_n++)
{
attr_t attri = 0;
@@ -301,7 +302,7 @@ static void draw_titled_keybinding_list(char * title, struct Win * win,
struct KeyBindingDB * kbdb)
{
uint8_t state = 0;
- uint16_t kb_n = 0;
+ uint8_t kb_n = 0;
while (0 == state || kb_n < kbdb->n_of_kbs)
{
if (0 == state)
@@ -337,14 +338,14 @@ extern void draw_win_log(struct Win * win)
extern void draw_win_map(struct Win * win)
{
- try_resize_winmap(win, world.map.size.y, world.map.size.x);
+ try_resize_winmap(win, world.map.length, world.map.length * 2);
uint16_t z = 0;
uint16_t x, y;
- for (y = 0; y < world.map.size.y; y++)
+ for (y = 0; y < world.map.length; y++)
{
- for (x = 0; x < world.map.size.x; x++)
+ for (x = 0; x < world.map.length; x++)
{
- set_ch_on_yx(win, y, x, world.map.cells[z]);
+ set_ch_on_yx(win, y, x * 2 + (y % 2), world.map.cells[z]);
z++;
}
}
@@ -396,14 +397,10 @@ extern void draw_win_inventory(struct Win * win)
extern void draw_win_available_keybindings(struct Win * win)
{
- char * title = "Active window's keybindings:";
- struct KeyBindingDB * kbdb;
+ char * title = "Active window's keys:";
struct Win * win_active = get_win_by_id(world.winDB.active);
- if (0 == win_active->view)
- {
- kbdb = &win_active->kb;
- }
- else if (1 == win_active->view)
+ struct KeyBindingDB * kbdb = &win_active->kb;
+ if (1 == win_active->view)
{
kbdb = &world.kb_wingeom;
}
@@ -414,7 +411,7 @@ extern void draw_win_available_keybindings(struct Win * win)
uint16_t offset = 0;
draw_titled_keybinding_list(title, win, &offset, 0, kbdb);
add_line(win, " ", 0, &offset, 0);
- title = "Global keybindings:";
+ title = "Global keys:";
draw_titled_keybinding_list(title, win, &offset, 1, &world.kb_global);
}
@@ -447,7 +444,7 @@ extern void draw_win_keybindings_winconf_keybindings(struct Win * win)
extern void draw_winconf_keybindings(struct Win * win)
{
- char * title = "Window's keybindings:";
+ char * title = "Window's keys:";
uint16_t offset = 0;
add_line(win, title, 0, &offset, 0);
add_line(win, " ", 0, &offset, 0);