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

Fix some Travis compile errors (#768)

Browse source
This commit is contained in:
Celtic Minstrel 2016-09-09 22:55:42 -04:00 • committed by GitHub
parent e993e2820b
commit 5e750b0083
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/widgets/chatbox.hpp
View file

@ -123,9 +123,9 @@ private:
std::function<void(void)> active_window_changed_callback_;
lobby_info* lobby_info_;
class lobby_info* lobby_info_;
lobby_info& lobby_info() { return *lobby_info_; }
class lobby_info& lobby_info() { return *lobby_info_; }
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const override;

2
src/sdl/utils.cpp
View file

@ -75,7 +75,7 @@ SDL_Color int_to_color(const Uint32 rgb)
SDL_Color string_to_color(const std::string& color_string)
{
SDL_Color color = {};
SDL_Color color = {0,0,0,0};
std::vector<Uint32> temp_rgb;
if(string2rgb(color_string, temp_rgb) && !temp_rgb.empty()) {

4
src/storyscreen/render.cpp
View file

@ -765,8 +765,8 @@ void part_ui::render_story_box()
last_key_ = true;
font::ttext t;
bool scan_finished = false;
SDL_Rect scan{};
SDL_Rect dstrect{};
SDL_Rect scan = {0,0,0,0};
SDL_Rect dstrect = {0,0,0,0};
while(true) {