home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug that reset turn number to 1 on each savefile load.
[plomrogue]
/
src
/
control.c
diff --git
a/src/control.c
b/src/control.c
index 35a8c31b66f55f39bbc64f5ed64bd1bbfe93e020..b9ebbe15ee3a7d0897540ce9946253d5aa252625 100644
(file)
--- a/
src/control.c
+++ b/
src/control.c
@@
-11,32
+11,33
@@
#include "map.h" /* for map_scroll(), map_center_player(), dir enum */
#include "main.h" /* for World struct */
#include "rexit.h" /* for exit_err() */
#include "map.h" /* for map_scroll(), map_center_player(), dir enum */
#include "main.h" /* for World struct */
#include "rexit.h" /* for exit_err() */
-#include "
misc
.h" /* for scroll_pad(), toggle_window(),
-
* growshrink_active_window
()
- */
+#include "
wincontrol
.h" /* for scroll_pad(), toggle_window(),
+
* growshrink_active_window(), reload_win_config
()
+
*/
#include "map_object_actions.h" /* for player_wait(), move_player() */
#include "map_object_actions.h" /* for player_wait(), move_player() */
+#include "command_db.h" /* for is_command_id_shortdsc() */
extern void record_control(int action, struct World * world)
{
extern void record_control(int action, struct World * world)
{
- if
(0 == action
)
+ if
(is_command_id_shortdsc(world, action, "wait")
)
{
player_wait(world);
}
{
player_wait(world);
}
- else if (
NORTH == action
)
+ else if (
is_command_id_shortdsc(world, action, "player_u")
)
{
move_player(world, NORTH);
}
{
move_player(world, NORTH);
}
- else if (
EAST == action
)
+ else if (
is_command_id_shortdsc(world, action, "player_r")
)
{
move_player(world, EAST);
}
{
move_player(world, EAST);
}
- else if (
SOUTH == action
)
+ else if (
is_command_id_shortdsc(world, action, "player_d")
)
{
move_player(world, SOUTH);
}
{
move_player(world, SOUTH);
}
- else if (
WEST == action
)
+ else if (
is_command_id_shortdsc(world, action, "player_l")
)
{
move_player(world, WEST);
}
{
move_player(world, WEST);
}
@@
-46,23
+47,23
@@
extern void record_control(int action, struct World * world)
extern uint8_t player_control(int key, struct World * world)
{
extern uint8_t player_control(int key, struct World * world)
{
- if (key == get_action_key(world->keybindings, "player
up
"))
+ if (key == get_action_key(world->keybindings, "player
_u
"))
{
move_player(world, NORTH);
}
{
move_player(world, NORTH);
}
- else if (key == get_action_key(world->keybindings, "player
right
"))
+ else if (key == get_action_key(world->keybindings, "player
_r
"))
{
move_player(world, EAST);
}
{
move_player(world, EAST);
}
- else if (key == get_action_key(world->keybindings, "player
down
"))
+ else if (key == get_action_key(world->keybindings, "player
_d
"))
{
move_player(world, SOUTH);
}
{
move_player(world, SOUTH);
}
- else if (key == get_action_key(world->keybindings, "player
left
"))
+ else if (key == get_action_key(world->keybindings, "player
_l
"))
{
move_player(world, WEST);
}
{
move_player(world, WEST);
}
- else if (key == get_action_key(world->keybindings, "wait
/ next turn
"))
+ else if (key == get_action_key(world->keybindings, "wait"))
{
player_wait(world);
}
{
player_wait(world);
}
@@
-90,97
+91,101
@@
extern uint8_t meta_control(int key, struct World * world)
{
return 1;
}
{
return 1;
}
- else if (key == get_action_key(world->keybindings, "scr
oll pad right
"))
+ else if (key == get_action_key(world->keybindings, "scr
l_r
"))
{
scroll_pad(win_meta, '+');
}
{
scroll_pad(win_meta, '+');
}
- else if (key == get_action_key(world->keybindings, "scr
oll pad left
"))
+ else if (key == get_action_key(world->keybindings, "scr
l_l
"))
{
scroll_pad(win_meta, '-');
}
{
scroll_pad(win_meta, '-');
}
- else if (key == get_action_key(world->keybindings, "to
ggle keys window
"))
+ else if (key == get_action_key(world->keybindings, "to
_keywin
"))
{
exit_err(toggle_window(win_meta, win_keys), world, err_toggle);
}
{
exit_err(toggle_window(win_meta, win_keys), world, err_toggle);
}
- else if (key == get_action_key(world->keybindings, "to
ggle map window
"))
+ else if (key == get_action_key(world->keybindings, "to
_mapwin
"))
{
exit_err(toggle_window(win_meta, win_map), world, err_toggle);
}
{
exit_err(toggle_window(win_meta, win_map), world, err_toggle);
}
- else if (key == get_action_key(world->keybindings, "to
ggle info window
"))
+ else if (key == get_action_key(world->keybindings, "to
_infowin
"))
{
exit_err(toggle_window(win_meta, win_info), world, err_toggle);
}
{
exit_err(toggle_window(win_meta, win_info), world, err_toggle);
}
- else if (key == get_action_key(world->keybindings, "to
ggle log window
"))
+ else if (key == get_action_key(world->keybindings, "to
_logwin
"))
{
exit_err(toggle_window(win_meta, win_log), world, err_toggle);
}
{
exit_err(toggle_window(win_meta, win_log), world, err_toggle);
}
- else if (key == get_action_key(world->keybindings, "cyc
le forwards
"))
+ else if (key == get_action_key(world->keybindings, "cyc
_win_f
"))
{
cycle_active_win(win_meta, 'f');
}
{
cycle_active_win(win_meta, 'f');
}
- else if (key == get_action_key(world->keybindings, "cyc
le backwards
"))
+ else if (key == get_action_key(world->keybindings, "cyc
_win_b
"))
{
cycle_active_win(win_meta, 'b');
}
{
cycle_active_win(win_meta, 'b');
}
- else if (key == get_action_key(world->keybindings, "shift
forwards
"))
+ else if (key == get_action_key(world->keybindings, "shift
_f
"))
{
exit_err(shift_active_win(win_meta, 'f'), world, err_shift);
}
{
exit_err(shift_active_win(win_meta, 'f'), world, err_shift);
}
- else if (key == get_action_key(world->keybindings, "shift
backwards
"))
+ else if (key == get_action_key(world->keybindings, "shift
_b
"))
{
exit_err(shift_active_win(win_meta, 'b'), world, err_shift);
}
{
exit_err(shift_active_win(win_meta, 'b'), world, err_shift);
}
- else if (key == get_action_key(world->keybindings, "grow
horizontally
"))
+ else if (key == get_action_key(world->keybindings, "grow
_h
"))
{
exit_err(growshrink_active_window(win_meta, '*'), world, err_resize);
}
{
exit_err(growshrink_active_window(win_meta, '*'), world, err_resize);
}
- else if (key == get_action_key(world->keybindings, "shri
nk horizontally
"))
+ else if (key == get_action_key(world->keybindings, "shri
_h
"))
{
exit_err(growshrink_active_window(win_meta, '_'), world, err_resize);
}
{
exit_err(growshrink_active_window(win_meta, '_'), world, err_resize);
}
- else if (key == get_action_key(world->keybindings, "grow
vertically
"))
+ else if (key == get_action_key(world->keybindings, "grow
_v
"))
{
exit_err(growshrink_active_window(win_meta, '+'), world, err_resize);
}
{
exit_err(growshrink_active_window(win_meta, '+'), world, err_resize);
}
- else if (key == get_action_key(world->keybindings, "shri
nk vertically
"))
+ else if (key == get_action_key(world->keybindings, "shri
_v
"))
{
exit_err(growshrink_active_window(win_meta, '-'), world, err_resize);
}
{
exit_err(growshrink_active_window(win_meta, '-'), world, err_resize);
}
- else if (key == get_action_key(world->keybindings, "save
keys"))
+ else if (key == get_action_key(world->keybindings, "save
_
keys"))
{
save_keybindings(world);
}
{
save_keybindings(world);
}
- else if (key == get_action_key(world->keybindings, "keys
nav up
"))
+ else if (key == get_action_key(world->keybindings, "keys
_u
"))
{
{
- keyswin_move_selection
(world, 'u');
+ keyswin_move_selection(world, 'u');
}
}
- else if (key == get_action_key(world->keybindings, "keys
nav down
"))
+ else if (key == get_action_key(world->keybindings, "keys
_d
"))
{
{
- keyswin_move_selection
(world, 'd');
+ keyswin_move_selection(world, 'd');
}
}
- else if (key == get_action_key(world->keybindings, "keys
mod
"))
+ else if (key == get_action_key(world->keybindings, "keys
_m
"))
{
{
- keyswin_mod_key
(world, win_meta);
+ keyswin_mod_key(world, win_meta);
}
}
- else if (key == get_action_key(world->keybindings, "map
up
"))
+ else if (key == get_action_key(world->keybindings, "map
_u
"))
{
map_scroll(world->map, NORTH, win_map->frame.size);
}
{
map_scroll(world->map, NORTH, win_map->frame.size);
}
- else if (key == get_action_key(world->keybindings, "map
down
"))
+ else if (key == get_action_key(world->keybindings, "map
_d
"))
{
map_scroll(world->map, SOUTH, win_map->frame.size);
}
{
map_scroll(world->map, SOUTH, win_map->frame.size);
}
- else if (key == get_action_key(world->keybindings, "map
right
"))
+ else if (key == get_action_key(world->keybindings, "map
_r
"))
{
map_scroll(world->map, EAST, win_map->frame.size);
}
{
map_scroll(world->map, EAST, win_map->frame.size);
}
- else if (key == get_action_key(world->keybindings, "map
left
"))
+ else if (key == get_action_key(world->keybindings, "map
_l
"))
{
map_scroll(world->map, WEST, win_map->frame.size);
}
{
map_scroll(world->map, WEST, win_map->frame.size);
}
- else if (key == get_action_key(world->keybindings, "map
center player
"))
+ else if (key == get_action_key(world->keybindings, "map
_c
"))
{
{
- map_center_player (world->map, world->player, win_map->frame.size);
+ map_center_player(world->map, world->player, win_map->frame.size);
+ }
+ else if (key == get_action_key(world->keybindings, "reload_wins"))
+ {
+ reload_win_config(world);
}
return 0;
}
}
return 0;
}