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

Added the ONSCREEN_WARP scrolltype which compines the features...

Browse source 
...of ONSCREEN and WARP scrolling.
This commit is contained in:
Fabian Müller 2011-06-23 15:00:46 +00:00
parent 8130c2bd5a
commit 17f430852b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/display.cpp
View file

@ -1595,7 +1595,7 @@ void display::scroll_to_xy(int screenxpos, int screenypos, SCROLL_TYPE scroll_ty
int xmove = xpos - xpos_;
int ymove = ypos - ypos_;
if(scroll_type == WARP || turbo_speed() > 2.0 || preferences::scroll_speed() > 99) {
if(scroll_type == WARP || scroll_type == ONSCREEN_WARP || turbo_speed() > 2.0 || preferences::scroll_speed() > 99) {
scroll(xmove,ymove);
draw();
return;
@ -1730,7 +1730,7 @@ void display::scroll_to_tiles(const std::vector<map_location>& locs,
//if everything is fogged or the locs list is empty
if(!valid) return;
if (scroll_type == ONSCREEN) {
if (scroll_type == ONSCREEN || ONSCREEN_WARP) {
SDL_Rect r = map_area();
int spacing = round_double(add_spacing*hex_size());
r.x += spacing;
@ -1753,7 +1753,7 @@ void display::scroll_to_tiles(const std::vector<map_location>& locs,
int target_x = locs_bbox.x + locs_bbox.w/2;
int target_y = locs_bbox.y + locs_bbox.h/2;
if (scroll_type == ONSCREEN) {
if (scroll_type == ONSCREEN || ONSCREEN_WARP) {
// when doing an ONSCREEN scroll we do not center the target unless needed
SDL_Rect r = map_area();
int map_center_x = r.x + r.w/2;

2
src/display.hpp
View file

@ -389,7 +389,7 @@ public:
/** Sets the zoom amount to the default. */
void set_default_zoom();
enum SCROLL_TYPE { SCROLL, WARP, ONSCREEN };
enum SCROLL_TYPE { SCROLL, WARP, ONSCREEN, ONSCREEN_WARP };
/**
* Scroll such that location loc is on-screen.