0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more improvement to rectangular scrolling logic...

Browse source
This commit is contained in:
Jérémy Rosen 2008-01-14 18:48:11 +00:00
parent 1780af741c
commit 847a6d5eb7
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/display.cpp
View file

@ -1558,6 +1558,18 @@ void display::scroll_to_tiles(const gamemap::location& loc1, const gamemap::loca
outside_area(map_area(),maxx,maxy)) {
if(!check_fogged || ( !fogged(loc1) && !fogged(loc2))) {
// Scroll to middle point of rectangle
if (scroll_type == ONSCREEN) {
// The tile must be fully visible
SDL_Rect r = map_area();
r.w -= hex_width();
r.h -= zoom_;
if (!outside_area(r,get_location_x(loc1),get_location_y(loc1)) &&
!outside_area(r,get_location_x(loc2),get_location_x(loc2)) ) {
return;
}
scroll_to_tile(gamemap::location((loc1.x+loc2.x)/2,(loc1.y+loc2.y)/2),SCROLL,check_fogged);
}
scroll_to_tile(gamemap::location((loc1.x+loc2.x)/2,(loc1.y+loc2.y)/2),scroll_type,check_fogged);
} else if(!fogged(loc1)) {
scroll_to_tile(loc1,scroll_type,check_fogged);
@ -1571,7 +1583,7 @@ void display::scroll_to_tiles(const gamemap::location& loc1, const gamemap::loca
}
void display::scroll_to_tiles(const std::vector<gamemap::location> locs,
void display::scroll_to_tiles(const std::vector<gamemap::location>& locs,
SCROLL_TYPE scroll_type, bool check_fogged)
{
gamemap::location min_loc,max_loc;
@ -1586,7 +1598,7 @@ void display::scroll_to_tiles(const std::vector<gamemap::location> locs,
}
//if everything is fogged
if(!min_loc.valid()) return;
scroll_to_tiles(min_loc,max_loc,scroll_type,check_fogged);
scroll_to_tiles(min_loc,max_loc,scroll_type,false);
}
void display::bounds_check_position()

2
src/display.hpp
View file

@ -304,7 +304,7 @@ public:
//! but this is not guaranteed.
void scroll_to_tiles(const gamemap::location& loc1, const gamemap::location& loc2,
SCROLL_TYPE scroll_type=ONSCREEN, bool check_fogged=true);
void scroll_to_tiles(const std::vector<gamemap::location> locs,
void scroll_to_tiles(const std::vector<gamemap::location>& locs,
SCROLL_TYPE scroll_type=ONSCREEN, bool check_fogged=true);
//! Expose the event, so observers can be notified about map scrolling.