#include <string.h> /* 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 */
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++)
{
try_resize_winmap(win, y + 1 + 1, win->winmap_size.x);
}
}
- * offset = x;
+ *offset = x;
}
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++;
}
}
extern void draw_win_available_keybindings(struct Win * win)
{
char * title = "Active window's keys:";
- struct KeyBindingDB * kbdb;
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;
}