X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=roguelike.c;h=89b64624036ebd5f16ae0256d46f27a90482e5d0;hb=891ff33aec8906fe8203910a26c56650ce74b904;hp=d2e8303edeaa8d7d1298b8cddea4f000ca66fdd6;hpb=3d455d7de0778ee27e234412c9b0ad253cf8a4ed;p=plomrogue
diff --git a/roguelike.c b/roguelike.c
index d2e8303..89b6462 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -2,17 +2,16 @@
#include
#include
#include
-#include
#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 Monster * monster;
+ struct Player * player; };
struct KeyBinding {
char * name;
@@ -23,9 +22,42 @@ struct KeysWinData {
char edit;
int select; };
-struct World {
- 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; };
+
+struct Monster {
+ 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 growshrink_active_window (struct WinMeta *, char);
+void init_keybindings(struct World *);
+struct Map init_map ();
+void map_scroll (struct Map *, char);
+void next_turn (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 keyswin_mod_key (struct World *, struct WinMeta *);
+void keyswin_move_selection (struct World *, char);
+char is_passable (struct World *, int, int);
+void move_player (struct World *, char);
+void player_wait(struct World *);
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.
@@ -40,32 +72,28 @@ 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
- mvwaddch(win->curses_win, y, x, text[z]);
+ 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; } }
- 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;
- for (y = 0; 0 == toggle; y++) // Determine number of lines text would have in a window of
- for (x = 0; x < win->width; x++) { // available width, but infinite height.
+ 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
- break; // stopping the loop. Make sure they don't count as cell space
- if ('\n' == text[z+1]) { // themselves.
+ 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]) {
@@ -73,11 +101,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,73 +116,216 @@ 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;
- 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;
+ struct Monster * monster = world->monster;
+ 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)
- mvwaddch(win->curses_win, y, x, '@');
+ if (z == (map->width * player->y) + player->x)
+ mvwaddch(win->curses, y, x, '@');
+ else if (z == (map->width * monster->y) + monster->x)
+ mvwaddch(win->curses, y, x, 'M');
else
- mvwaddch(win->curses_win, y, x, cells[z]);
- z++; }
- else
- mvwaddch(win->curses_win, y, x, ' '); } } }
+ 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.
- 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); }
+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_win)
+ if (0 != win->curses)
suspend_window(win_meta, 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");
+ 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;
- map.width = 128;
- map.height = 128;
+ map.width = 96;
+ map.height = 32;
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;
+ int x, y, ran;
+ char terrain;
for (y = 0; y < map.height; y++)
- for (x = 0; x < map.width; x++)
- map.cells[(y * map.width) + x] = '.';
- map.cells[(5 * map.width) + 5] = 'X';
- map.cells[(3 * map.width) + 8] = 'X';
- map.cells[(8 * map.width) + 3] = 'X';
+ for (x = 0; x < map.width; x++) {
+ terrain = '.';
+ ran = rand();
+ if ( 0 == ran % ((x*x) / 3 + 1)
+ || 0 == ran % ((y*y) / 3 + 1)
+ || 0 == ran % ((map.width - x - 1) * (map.width - x - 1) / 3 + 1)
+ || 0 == ran %((map.height - y - 1) * (map.height - y - 1) / 3 + 1))
+ terrain = ' ';
+ map.cells[(y * map.width) + x] = terrain; }
return map; }
-void update_info (struct Win * win) {
-// Update info data by incrementing turn value.
- * (int *) win->data = * (int *) win->data + 1; }
+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 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; }
+
+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.
@@ -209,150 +377,112 @@ 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; // max length assured by get_keyname()
- char * keydesc = malloc(keydescwidth + 1);
- attr_t attri;
- int y, x;
- char * keyname;
- for (y = 0; 0 != keybindings[offset + y].name && 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);
- free(keyname);
- for (x = 0; x < win->width; x++)
- if (strlen(keydesc) > x)
- 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, ' '); }
+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 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;
- c_count = 0;
- lines++; } }
- struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding));
- fseek(file, 0, SEEK_SET);
- char * command = malloc(linemax);
- char commcount = 0;
- char * digits = malloc(3);
- char digicount = 0;
- int key, digimax;
- int keycount = 0;
- c = getc(file);
- while (EOF != c) {
- if ('\n' == c) {
- keybindings[keycount].name = calloc(commcount, sizeof(char));
- memcpy(keybindings[keycount].name, command, commcount);
- keybindings[keycount].key = key;
- keycount++;
- digicount = 0;
- commcount = 0; }
- else if (-1 != digicount)
- if (' ' == c) {
- key = 0;
- digimax = digicount - 1;
- while (digicount > 0) {
- digicount--;
- key = key + ((digits[digicount] - 48) * pow(10, digimax - digicount)); }
- digicount = -1; }
- else {
- digits[digicount] = c;
- digicount++; }
+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;
+ if (0 <= x && x < world->map->width && 0 <= y && y < world->map->height)
+ if ('.' == world->map->cells[y * world->map->width + x])
+ passable = 1;
+ return passable; }
+
+void move_player (struct World * world, char d) {
+// Move player in direction d, increment turn counter and update log.
+ static char prev = 0;
+ char success = 0;
+ char * dir;
+ char ty = world->player->y;
+ char tx = world->player->x;
+ if ('s' == d) {
+ dir = "south";
+ ty++; }
+ if ('n' == d) {
+ dir = "north";
+ ty--; }
+ if ('w' == d) {
+ dir = "west";
+ tx--; }
+ if ('e' == d) {
+ dir = "east";
+ 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 {
+ if (2 == success)
+ update_log (world, "\nYou hit the monster.");
else {
- command[commcount] = c;
- commcount++; }
- c = getc(file); }
- free(command);
- free(digits);
- 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; }
+ 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;
+ next_turn (world); }
-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); }
+void player_wait(struct World * world) {
+// Make player wait one turn.
+ next_turn (world);
+ update_log (world, "\nYou wait."); }
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 = ↦
+ struct Player player;
+ 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();
curs_set(0);
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;
- struct Map map = init_map();
- win_map.data = ↦
-
+ win_map.data = &world;
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;
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;
int key;
while (1) {
@@ -360,6 +490,10 @@ int main () {
key = getch();
if (key == get_action_key(world.keybindings, "quit"))
break;
+ else if (key == get_action_key(world.keybindings, "scroll pad right"))
+ 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"))
@@ -368,62 +502,55 @@ 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 hor") && win_meta.active != 0)
- resize_window(&win_meta, '*');
- else if (key == get_action_key(world.keybindings, "shrink hor") && win_meta.active != 0)
- resize_window(&win_meta, '_');
- else if (key == get_action_key(world.keybindings, "grow ver") && win_meta.active != 0)
- resize_window(&win_meta, '+');
- else if (key == get_action_key(world.keybindings, "shrink ver") && 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--;
- 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.");
- 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.");
- 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.");
- 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.");
- map.player_x--; }
- else if (key == get_action_key(world.keybindings, "wait") ) {
- update_info (&win_info);
- update_log (&win_log, "\nYou wait."); } }
+ 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"))
+ move_player(&world, 'n');
+ else if (key == get_action_key(world.keybindings, "player right"))
+ 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") )
+ player_wait (&world); }
+
+ 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; }