X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=roguelike.c;h=e7ece3a0a58601b8d99a22b40ec1a10959e28422;hb=ed160c85898e726c7daf6b329f5e807e760ba3ed;hp=ac7252ea3f4ec105cb28692310363b0ee0cedb2c;hpb=0aa35d081a2386ff02562a38a55c75215e3159e5;p=plomrogue
diff --git a/roguelike.c b/roguelike.c
index ac7252e..e7ece3a 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -46,12 +46,13 @@ void draw_keys_window (struct Win *);
void toggle_window (struct WinMeta *, struct Win *);
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 mod_key (struct World *, struct WinMeta *);
+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);
@@ -249,6 +250,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++;
@@ -349,8 +361,8 @@ char * get_keyname(int keycode) {
sprintf(keyname, "(unknown)");
return keyname; }
-void mod_key (struct World * world, struct WinMeta * win_meta) {
-// In keybinding window, mark selection modifiable, modify key. Ensure max of three digits in key code field.
+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();
@@ -463,9 +475,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"))
@@ -474,13 +486,13 @@ 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)
+ else if (key == get_action_key(world.keybindings, "shift forwards"))
shift_window(&win_meta, 'f');
- else if (key == get_action_key(world.keybindings, "shift backwards") && win_meta.active != 0)
+ else if (key == get_action_key(world.keybindings, "shift backwards"))
shift_window(&win_meta, 'b');
else if (key == get_action_key(world.keybindings, "grow horizontally") && win_meta.active != 0)
resize_window(&win_meta, '*');
@@ -497,15 +509,15 @@ int main () {
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"))
- mod_key (&world, &win_meta);
- else if (key == get_action_key(world.keybindings, "map up") && map.offset_y > 0)
- map.offset_y--;
+ 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"))