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

reduce excess scrolling even further

Browse source
This commit is contained in:
András Salamon 2005-11-21 12:15:17 +00:00
parent cde30d2fb9
commit abd9bb607b
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/display.cpp
View file

@ -225,6 +225,12 @@ SDL_Rect display::screen_area() const
return res;
}
bool display::outside_area(const SDL_Rect& area, const int x, const int y) const
{
return (x < area.x || x >= area.x + area.w ||
y < area.y || y >= area.y + area.h);
}
void display::select_hex(gamemap::location hex)
{
if(team_valid() && teams_[currentTeam_].fogged(hex.x,hex.y)) {
@ -501,6 +507,8 @@ void display::scroll_to_tile(int x, int y, SCROLL_TYPE scroll_type, bool check_f
const int xpos = get_location_x(loc);
const int ypos = get_location_y(loc);
if ((scroll_type == ONSCREEN) && !outside_area(map_area(),xpos,ypos))
return;
const int speed = preferences::scroll_speed()*2;
@ -554,15 +562,15 @@ void display::scroll_to_tiles(int x1, int y1, int x2, int y2,
if(diffx > map_area().w || diffy > map_area().h) {
scroll_to_tile(x1,y1,scroll_type,check_fogged);
} else {
// only scroll if rectangle is outside map area
// only scroll if rectangle is not completely inside map area
// assume most paths are within rectangle, sometimes
// with rugged terrain this is not true -- but use common
// cases to determine behaviour instead of exceptions
if (minx < map_area().x || maxx > map_area().x + map_area().w
|| miny < map_area().y || maxy > map_area().y + map_area().h) {
if (outside_area(map_area(),minx,miny) ||
outside_area(map_area(),maxx,maxy)) {
// scroll to middle point of rectangle
scroll_to_tile((x1+x2)/2,(y1+y2)/2,scroll_type,check_fogged);
} // else don't scroll, map area is already OK
} // else don't scroll, rectangle is already on screen
}
}
@ -571,7 +579,7 @@ void display::scroll_to_leader(unit_map& units, int side){
if(leader != units_.end()) {
const hotkey::basic_handler key_events_handler(this);
scroll_to_tile(leader->first.x,leader->first.y);
scroll_to_tile(leader->first.x,leader->first.y,ONSCREEN);
}
}

7
src/display.hpp
View file

@ -96,9 +96,11 @@ public:
//(i.e. not entirely from tip to tip -- use hex_size() to get the distance from tip to tip)
int hex_width() const;
enum SCROLL_TYPE { SCROLL, WARP };
enum SCROLL_TYPE { SCROLL, WARP, ONSCREEN };
//function which will scroll such that location x,y is on-screen.
// WARP jumps to x,y; SCROLL uses scroll speed;
// ONSCREEN only scrolls if x,y is offscreen
void scroll_to_tile(int x, int y, SCROLL_TYPE scroll_type=SCROLL, bool check_fogged=true);
//function which will scroll such that location x1,y1 is on-screen.
@ -133,6 +135,9 @@ public:
SDL_Rect screen_area() const;
//check if pixel x,y is outside specified area
bool display::outside_area(const SDL_Rect& area, const int x, const int y) const;
//function to display a location as selected. If a unit is in the location,
//and there is no unit in the currently highlighted hex, the unit will be
//displayed in the sidebar.