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

Make some functions static in display.{cpp,hpp}

Browse source
This commit is contained in:
Rikard Falkeborn 2017-12-20 13:53:00 +01:00 • committed by Jyrki Vesterinen
parent 393ac9bd70
commit 557bbf36ea
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/display.cpp
View file

@ -485,7 +485,7 @@ void display::fill_images_list(const std::string& prefix, std::vector<std::strin
images.emplace_back();
}
const std::string& display::get_variant(const std::vector<std::string>& variants, const map_location &loc) const
const std::string& display::get_variant(const std::vector<std::string>& variants, const map_location &loc)
{
//TODO use better noise function
return variants[std::abs(loc.x + loc.y) % variants.size()];
@ -577,7 +577,7 @@ const SDL_Rect& display::map_area() const
return res;
}
bool display::outside_area(const SDL_Rect& area, const int x, const int y) const
bool display::outside_area(const SDL_Rect& area, const int x, const int y)
{
const int x_thresh = hex_size();
const int y_thresh = hex_size();
@ -2010,12 +2010,12 @@ bool display::scroll(int xmove, int ymove, bool force)
return true;
}
bool display::zoom_at_max() const
bool display::zoom_at_max()
{
return zoom_ == MaxZoom;
}
bool display::zoom_at_min() const
bool display::zoom_at_min()
{
return zoom_ == MinZoom;
}

18
src/display.hpp
View file

@ -237,7 +237,7 @@ public:
max_map_area() : theme_.main_map_location(screen_.screen_area()); }
/** Check if the bbox of the hex at x,y has pixels outside the area rectangle. */
bool outside_area(const SDL_Rect& area, const int x,const int y) const;
static bool outside_area(const SDL_Rect& area, const int x,const int y);
/**
* Function which returns the width of a hex in pixels,
@ -245,16 +245,16 @@ public:
* (i.e. not entirely from tip to tip -- use hex_size()
* to get the distance from tip to tip)
*/
int hex_width() const { return (zoom_*3)/4; }
static int hex_width() { return (zoom_*3)/4; }
/**
* Function which returns the size of a hex in pixels
* (from top tip to bottom tip or left edge to right edge).
*/
int hex_size() const { return zoom_; }
static int hex_size(){ return zoom_; }
/** Returns the current zoom factor. */
double get_zoom_factor() const { return double(zoom_)/double(game_config::tile_size); }
static double get_zoom_factor() { return double(zoom_)/double(game_config::tile_size); }
/**
* given x,y co-ordinates of an onscreen pixel, will return the
@ -388,7 +388,7 @@ public:
std::shared_ptr<gui::button> find_action_button(const std::string& id);
std::shared_ptr<gui::button> find_menu_button(const std::string& id);
gui::button::TYPE string_to_button_type(std::string type);
static gui::button::TYPE string_to_button_type(std::string type);
void create_buttons();
void layout_buttons();
@ -503,8 +503,8 @@ public:
/** Sets the display zoom to the specified amount. */
bool set_zoom(unsigned int amount, const bool validate_value_and_set_index = true);
bool zoom_at_max() const;
bool zoom_at_min() const;
static bool zoom_at_max();
static bool zoom_at_min();
/** Sets the zoom amount to the default. */
void set_default_zoom();
@ -720,9 +720,9 @@ protected:
void scroll_to_xy(int screenxpos, int screenypos, SCROLL_TYPE scroll_type,bool force = true);
void fill_images_list(const std::string& prefix, std::vector<std::string>& images);
static void fill_images_list(const std::string& prefix, std::vector<std::string>& images);
const std::string& get_variant(const std::vector<std::string>& variants, const map_location &loc) const;
static const std::string& get_variant(const std::vector<std::string>& variants, const map_location &loc);
CVideo& screen_;
size_t currentTeam_;