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

display: Allow disabling viewport scrolling

Browse source 
This will later allow WML/Lua to lock the viewport so the user cannot
scroll away from the current viewport location. WML and Lua actions such
as [scroll], [scroll_to] and [scroll_to_unit] will always be able to
scroll the screen regardless of this setting.
This commit is contained in:
Ignacio R. Morelle 2012-06-11 09:37:33 +00:00
parent 5beca9f7df
commit b12bb3524a
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/display.cpp
View file

@ -84,6 +84,7 @@ display::display(unit_map* units, CVideo& video, const gamemap* map, const std::
energy_bar_rects_(),
xpos_(0),
ypos_(0),
view_locked_(false),
theme_(theme_cfg, screen_area()),
zoom_(DefaultZoom),
builder_(new terrain_builder(level, map, theme_.border().tile_image)),
@ -1634,8 +1635,12 @@ void display::draw_minimap_units()
}
}
bool display::scroll(int xmove, int ymove)
bool display::scroll(int xmove, int ymove, bool force)
{
if(view_locked_ && !force) {
return false;
}
const int orig_x = xpos_;
const int orig_y = ypos_;
xpos_ += xmove;
@ -1769,7 +1774,7 @@ bool display::tile_nearly_on_screen(const map_location& loc) const
void display::scroll_to_xy(int screenxpos, int screenypos, SCROLL_TYPE scroll_type, bool force)
{
if(!force && !preferences::scroll_to_action()) return;
if(!force && (view_locked_ || !preferences::scroll_to_action())) return;
if(screen_.update_locked()) {
return;
}
@ -1784,7 +1789,7 @@ void display::scroll_to_xy(int screenxpos, int screenypos, SCROLL_TYPE scroll_ty
int ymove = ypos - ypos_;
if(scroll_type == WARP || scroll_type == ONSCREEN_WARP || turbo_speed() > 2.0 || preferences::scroll_speed() > 99) {
scroll(xmove,ymove);
scroll(xmove,ymove,true);
draw();
return;
}
@ -1839,7 +1844,7 @@ void display::scroll_to_xy(int screenxpos, int screenypos, SCROLL_TYPE scroll_ty
int dx = x_new - x_old;
int dy = y_new - y_old;
scroll(dx,dy);
scroll(dx,dy,true);
x_old += dx;
y_old += dy;
draw();
@ -2712,6 +2717,7 @@ void display::update_arrow(arrow & arrow)
void display::write(config& cfg) const
{
cfg["view_locked"] = view_locked_;
cfg["color_adjust_red"] = color_adjust_.r;
cfg["color_adjust_green"] = color_adjust_.g;
cfg["color_adjust_blue_"] = color_adjust_.b;
@ -2719,6 +2725,7 @@ void display::write(config& cfg) const
void display::read(const config& cfg)
{
view_locked_ = cfg["view_locked"].to_bool(false);
color_adjust_.r = cfg["color_adjust_red"].to_int(0);
color_adjust_.g = cfg["color_adjust_green"].to_int(0);
color_adjust_.b = cfg["color_adjust_blue_"].to_int(0);

11
src/display.hpp
View file

@ -453,7 +453,7 @@ public:
* Invalidation and redrawing will be scheduled.
* @return true if the map actually moved.
*/
bool scroll(int xmov, int ymov);
bool scroll(int xmov, int ymov, bool force = false);
/**
* Zooms the display by the specified amount.
@ -467,13 +467,19 @@ public:
/** Sets the zoom amount to the default. */
void set_default_zoom();
bool view_locked() const { return view_locked_; }
/** Sets whether the map view is locked (e.g. so the user can't scroll away) */
void set_view_locked(bool value) { view_locked_ = value; };
enum SCROLL_TYPE { SCROLL, WARP, ONSCREEN, ONSCREEN_WARP };
/**
* Scroll such that location loc is on-screen.
* WARP jumps to loc; SCROLL uses scroll speed;
* ONSCREEN only scrolls if x,y is offscreen
* force : scroll even if preferences tell us not to
* force : scroll even if preferences tell us not to,
* or the view is locked.
*/
void scroll_to_tile(const map_location& loc, SCROLL_TYPE scroll_type=ONSCREEN, bool check_fogged=true,bool force = true);
@ -649,6 +655,7 @@ protected:
const team *viewpoint_;
std::map<surface,SDL_Rect> energy_bar_rects_;
int xpos_, ypos_;
bool view_locked_;
theme theme_;
int zoom_;
static int last_zoom_;

2
src/game_events.cpp
View file

@ -936,7 +936,7 @@ WML_HANDLER_FUNCTION(color_adjust, /*event_info*/, cfg)
WML_HANDLER_FUNCTION(scroll, /*event_info*/, cfg)
{
game_display &screen = *resources::screen;
screen.scroll(cfg["x"], cfg["y"]);
screen.scroll(cfg["x"], cfg["y"], true);
screen.draw(true,true);
}