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

Fix XCode warnings and add missing header ref

Browse source
This commit is contained in:
Celtic Minstrel 2016-09-06 18:48:14 -04:00
parent e3346fec78
commit 8d6e513671
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
View file

@ -1601,6 +1601,7 @@
918C8A1D1D05F9AA009744A0 /* wesnothd_connection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = wesnothd_connection.hpp; sourceTree = "<group>"; };
918C8A211D05FDAA009744A0 /* logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logging.cpp; sourceTree = "<group>"; };
918C8A221D05FDAA009744A0 /* logging.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = logging.hpp; sourceTree = "<group>"; };
918CEF781D7F7EE70025E32C /* status_label_helper.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = status_label_helper.hpp; sourceTree = "<group>"; };
9190B73A1CA0554900B0EF66 /* lua_pathfind_cost_calculator.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = lua_pathfind_cost_calculator.hpp; sourceTree = "<group>"; };
9190B73B1CA0564700B0EF66 /* register_widget.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = register_widget.hpp; sourceTree = "<group>"; };
9193FC731D5A62FA004F6C07 /* unit_advance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unit_advance.cpp; sourceTree = "<group>"; };
@ -4473,6 +4474,7 @@
B5A9BD100ECA805A002BE442 /* spacer.hpp */,
B508D2141001560100B12852 /* stacked_widget.cpp */,
B508D2151001560100B12852 /* stacked_widget.hpp */,
918CEF781D7F7EE70025E32C /* status_label_helper.hpp */,
B5A9BD110ECA805A002BE442 /* text.cpp */,
B5A9BD120ECA805A002BE442 /* text.hpp */,
B5A9BD130ECA805A002BE442 /* text_box.cpp */,

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 = {0};
SDL_Color color = {};
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 = {0};
SDL_Rect dstrect = {0};
SDL_Rect scan = {};
SDL_Rect dstrect = {};
while(true) {