X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fclient%2Fmap.c;h=7c2dcc384590df51b3dcfa46c9bcb577a6755e27;hb=1452d43c6d7c89219cda91362da53ac8e4acb887;hp=7292c89151a8ecb62a0a0b6c7c3d53e7f67c4e79;hpb=539f4419afa0966d67b341dc6b30a6174bd3f844;p=plomrogue diff --git a/src/client/map.c b/src/client/map.c index 7292c89..7c2dcc3 100644 --- a/src/client/map.c +++ b/src/client/map.c @@ -10,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; @@ -43,5 +43,5 @@ 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; }