X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fclient%2Fmap.c;h=2a1d66f300a90d02eb09a0d9752b16dbbadfff38;hb=7e43b1fff89706212291384ddaa762fa30b02cb4;hp=5e4e9c6f769d7cc640a2fbd450ae2414a6bae9bd;hpb=f9c94db47aa883149aa762fa128ac1ff1b3f92e1;p=plomrogue
diff --git a/src/client/map.c b/src/client/map.c
index 5e4e9c6..2a1d66f 100644
--- a/src/client/map.c
+++ b/src/client/map.c
@@ -2,8 +2,7 @@
#include "map.h"
#include /* uint8_t */
-#include "misc.h" /* center_offset() */
-#include "windows.h" /* struct Win, get_win_by_id() */
+#include "windows.h" /* struct Win, center_offset(), get_win_by_id() */
#include "world.h" /* for global world */
@@ -11,25 +10,25 @@
extern void map_scroll(char d)
{
struct Win * win = get_win_by_id('m');
- uint8_t offset;
- if (('8' == d || '2' == d) && world.map.size.y > win->frame_size.y)
+ uint16_t offset;
+ if (('8' == d || '2' == d) && world.map.length > win->frame_size.y)
{
offset = center_offset(win->center.y,
- world.map.size.y, win->frame_size.y);
+ world.map.length, win->frame_size.y);
win->center.y = offset + (win->frame_size.y / 2);
- if ('2' == d && win->center.y < world.map.size.y - 1)
+ if ('2' == d && win->center.y < world.map.length - 1)
{
win->center.y++;
return;
}
win->center.y = win->center.y - ('8' == d && win->center.y > 0);
}
- else if (('4' == d || '6' == d) && world.map.size.x > win->frame_size.x)
+ else if (('4' == d || '6' == d) && (world.map.length*2) > win->frame_size.x)
{
offset = center_offset(win->center.x,
- world.map.size.x, win->frame_size.x);
+ world.map.length*2, win->frame_size.x);
win->center.x = offset + (win->frame_size.x / 2);
- if ('6' == d && win->center.x < world.map.size.x - 1)
+ if ('6' == d && win->center.x < (world.map.length * 2) - 1)
{
win->center.x++;
return;
@@ -44,5 +43,12 @@ extern void map_center()
{
struct Win * win_map = get_win_by_id('m');
win_map->center.y = world.player_pos.y;
- win_map->center.x = world.player_pos.x;
+ win_map->center.x = world.player_pos.x * 2;
+}
+
+
+
+extern void toggle_autofocus()
+{
+ world.focus_each_turn = world.focus_each_turn ? 0 : 1;
}