X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=roguelike.c;h=89b64624036ebd5f16ae0256d46f27a90482e5d0;hb=891ff33aec8906fe8203910a26c56650ce74b904;hp=c22cc48a501eb346137628db2a9104599967a511;hpb=ca11ff515801cdbc5194024514b0a861d8886334;p=plomrogue
diff --git a/roguelike.c b/roguelike.c
index c22cc48..89b6462 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -44,13 +44,17 @@ 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 *);
@@ -189,6 +193,21 @@ void toggle_window (struct WinMeta * win_meta, struct Win * 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");
@@ -247,6 +266,17 @@ struct Map init_map () {
map.cells[(y * map.width) + x] = terrain; }
return map; }
+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++;
@@ -347,6 +377,22 @@ char * get_keyname(int keycode) {
sprintf(keyname, "(unknown)");
return keyname; }
+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 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;
@@ -445,9 +491,9 @@ int main () {
if (key == get_action_key(world.keybindings, "quit"))
break;
else if (key == get_action_key(world.keybindings, "scroll pad right"))
- win_meta.pad_offset++;
- else if (key == get_action_key(world.keybindings, "scroll pad left") && win_meta.pad_offset > 0)
- win_meta.pad_offset--;
+ 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"))
@@ -456,43 +502,38 @@ 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 horizontally") && win_meta.active != 0)
- resize_window(&win_meta, '*');
- else if (key == get_action_key(world.keybindings, "shrink horizontally") && win_meta.active != 0)
- resize_window(&win_meta, '_');
- else if (key == get_action_key(world.keybindings, "grow vertically") && win_meta.active != 0)
- resize_window(&win_meta, '+');
- else if (key == get_action_key(world.keybindings, "shrink vertically") && 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--;
+ 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"))