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

Fix Travis

Browse source
This commit is contained in:
Celtic Minstrel 2016-12-01 00:20:14 -05:00 • committed by Jyrki Vesterinen
parent a97c5edccd
commit e7e5ca5fa2
48 changed files with 81 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
projectfiles/VC12/wesnoth.vcxproj
View file

@ -3029,14 +3029,6 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Scripting\Plugins\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Scripting\Plugins\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\sdl\color.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)SDL\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)SDL\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)SDL\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)SDL\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)SDL\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)SDL\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\sdl\exception.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)SDL\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)SDL\</ObjectFileName>
@ -4344,7 +4336,6 @@
<ClInclude Include="..\..\src\scripting\plugins\context.hpp" />
<ClInclude Include="..\..\src\scripting\plugins\manager.hpp" />
<ClInclude Include="..\..\src\scripting\push_check.hpp" />
<ClInclude Include="..\..\src\sdl\color.hpp" />
<ClInclude Include="..\..\src\sdl\exception.hpp" />
<ClInclude Include="..\..\src\sdl\rect.hpp" />
<ClInclude Include="..\..\src\sdl\utils.hpp" />

6
projectfiles/VC12/wesnoth.vcxproj.filters
View file

@ -1199,9 +1199,6 @@
<ClCompile Include="..\..\src\hotkey\hotkey_preferences_display.cpp">
<Filter>Hotkeys</Filter>
</ClCompile>
<ClCompile Include="..\..\src\sdl\color.cpp">
<Filter>SDL</Filter>
</ClCompile>
<ClCompile Include="..\..\src\sdl\exception.cpp">
<Filter>SDL</Filter>
</ClCompile>
@ -2561,9 +2558,6 @@
<ClInclude Include="..\..\src\hotkey\hotkey_manager.hpp">
<Filter>Hotkeys</Filter>
</ClInclude>
<ClInclude Include="..\..\src\sdl\color.hpp">
<Filter>SDL</Filter>
</ClInclude>
<ClInclude Include="..\..\src\sdl\exception.hpp">
<Filter>SDL</Filter>
</ClInclude>

2
projectfiles/VC12/wesnothlib.vcxproj
View file

@ -167,6 +167,7 @@
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\color.cpp" />
<ClCompile Include="..\..\src\color_range.cpp" />
<ClCompile Include="..\..\src\config.cpp" />
<ClCompile Include="..\..\src\filesystem_boost.cpp" />
@ -193,6 +194,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\about.hpp" />
<ClInclude Include="..\..\src\color.hpp" />
<ClInclude Include="..\..\src\config.hpp" />
<ClInclude Include="..\..\src\config_assign.hpp" />
<ClInclude Include="..\..\src\filesystem.hpp" />

2
projectfiles/VC12/wesnothlib.vcxproj.filters
View file

@ -53,6 +53,7 @@
<ClCompile Include="..\..\src\font\constants.cpp">
<Filter>Font</Filter>
</ClCompile>
<ClCompile Include="..\..\src\color.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\serialization\binary_or_text.hpp">
@ -123,5 +124,6 @@
<Filter>spirit_po</Filter>
</ClInclude>
<ClInclude Include="..\..\src\spirit_po.hpp" />
<ClInclude Include="..\..\src\color.hpp" />
</ItemGroup>
</Project>

2
src/CMakeLists.txt
View file

@ -209,6 +209,7 @@ endif(ENABLE_SHARED_LIBRARIES)
set(libwesnoth-core_STAT_SRC
color_range.cpp
color.cpp
config.cpp
filesystem_boost.cpp
filesystem_common.cpp
@ -363,7 +364,6 @@ set_target_properties(wesnoth-lua
########### Helper libraries ###############
set(wesnoth-sdl_SRC
sdl/color.cpp
sdl/exception.cpp
sdl/rect.cpp
sdl/window.cpp

2
src/SConscript
View file

@ -19,6 +19,7 @@ for env in [test_env, client_env, env]:
libwesnoth_core_sources = Split("""
color_range.cpp
color.cpp
config.cpp
font/constants.cpp
hash.cpp
@ -160,7 +161,6 @@ libcampaignd_sources = Split("""
libcampaignd = env.Library("campaignd", libcampaignd_sources, OBJPREFIX = "campaignd_")
libwesnoth_sdl_sources = Split("""
sdl/color.cpp
sdl/exception.cpp
sdl/rect.cpp
sdl/utils.cpp

2
src/ai/formula/function_table.cpp
View file

@ -33,7 +33,7 @@
#include "pathfind/teleport.hpp"
#include "replay.hpp"
#include "resources.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "terrain/filter.hpp"
#include "units/unit.hpp"
#include "pathfind/pathfind.hpp"

8
src/sdl/color.cpp → src/color.cpp
View file

@ -12,7 +12,7 @@
*/
#include "serialization/string_utils.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include <iomanip>
#include <sstream>
@ -34,7 +34,7 @@ color_t color_t::from_rgba_string(const std::string& c)
static_cast<uint8_t>(std::stoul(fields[0])),
static_cast<uint8_t>(std::stoul(fields[1])),
static_cast<uint8_t>(std::stoul(fields[2])),
static_cast<uint8_t>(fields.size() == 4 ? std::stoul(fields[3]) : SDL_ALPHA_OPAQUE)
static_cast<uint8_t>(fields.size() == 4 ? std::stoul(fields[3]) : ALPHA_OPAQUE)
};
}
@ -54,7 +54,7 @@ color_t color_t::from_rgb_string(const std::string& c)
static_cast<uint8_t>(std::stoul(fields[0])),
static_cast<uint8_t>(std::stoul(fields[0])),
static_cast<uint8_t>(std::stoul(fields[0])),
static_cast<uint8_t>(SDL_ALPHA_OPAQUE)
static_cast<uint8_t>(ALPHA_OPAQUE)
};
}
@ -70,7 +70,7 @@ color_t color_t::from_hex_string(const std::string& c)
static_cast<uint8_t>((0x00FFFFFF & temp_c) >> 16),
static_cast<uint8_t>((0x00FFFFFF & temp_c) >> 8),
static_cast<uint8_t>((0x00FFFFFF & temp_c)),
SDL_ALPHA_OPAQUE
ALPHA_OPAQUE
};
}

22
src/sdl/color.hpp → src/color.hpp
View file

@ -20,7 +20,7 @@
#include <string>
#include <utility>
#include <SDL.h>
struct SDL_Color;
//
// TODO: constexpr
@ -46,28 +46,26 @@ const uint32_t RGBA_RED_BITSHIFT = 24;
const uint32_t RGBA_GREEN_BITSHIFT = 16;
const uint32_t RGBA_BLUE_BITSHIFT = 8;
const uint32_t ALPHA_OPAQUE = 255;
struct color_t
{
color_t()
: r(255)
, g(255)
, b(255)
, a(SDL_ALPHA_OPAQUE)
, a(ALPHA_OPAQUE)
{}
color_t(uint8_t r_val, uint8_t g_val, uint8_t b_val, uint8_t a_val = SDL_ALPHA_OPAQUE)
color_t(uint8_t r_val, uint8_t g_val, uint8_t b_val, uint8_t a_val = ALPHA_OPAQUE)
: r(r_val)
, g(g_val)
, b(b_val)
, a(a_val)
{}
explicit color_t(const SDL_Color& c)
: r(c.r)
, g(c.g)
, b(c.b)
, a(c.a)
{}
// Implemented in sdl/utils.cpp to avoid dependency nightmares
explicit color_t(const SDL_Color& c);
/**
* Creates a new color_t object from a string variable in "R,G,B,A" format.
@ -173,10 +171,8 @@ struct color_t
*
* @return The new color_t object.
*/
SDL_Color to_sdl() const
{
return {r, g, b, a};
}
// Implemented in sdl/utils.cpp to avoid dependency nightmares
SDL_Color to_sdl() const;
/** Red value */
uint8_t r;

2
src/color_range.hpp
View file

@ -18,7 +18,7 @@
#define COLOR_RANGE_H_INCLUDED
#include "global.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include <cstdint>
#include <string>

2
src/display.cpp
View file

@ -37,7 +37,7 @@
#include "play_controller.hpp" //note: this can probably be refactored out
#include "reports.hpp"
#include "resources.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "synced_context.hpp"
#include "team.hpp"
#include "terrain/builder.hpp"

2
src/display_chat_manager.cpp
View file

@ -24,7 +24,7 @@
#include "font/marked-up_text.hpp"
#include "mp_ui_alerts.hpp"
#include "serialization/string_utils.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include <SDL_timer.h>

2
src/editor/action/mouse/mouse_action_map_label.cpp
View file

@ -22,7 +22,7 @@
#include "gui/dialogs/editor/edit_label.hpp"
#include "font/standard_colors.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
namespace editor {

2
src/floating_label.hpp
View file

@ -14,7 +14,7 @@
#pragma once
#include "sdl/color.hpp"
#include "color.hpp"
#include "sdl/utils.hpp"
#include <string>

4
src/font/marked-up_text.hpp
View file

@ -17,7 +17,7 @@
#ifndef MARKED_UP_TEXT_HPP_INCLUDED
#define MARKED_UP_TEXT_HPP_INCLUDED
#include "sdl/color.hpp"
#include "color.hpp"
class CVideo;
class surface;
@ -25,6 +25,8 @@ class surface;
#include <string>
#include "serialization/unicode_types.hpp"
#include <SDL.h>
namespace font {
/** Standard markups for color, size, font, images. */

2
src/font/sdl_ttf.hpp
View file

@ -18,7 +18,7 @@
#include "constants.hpp"
#include "font_id.hpp"
#include "font_description.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include <string>

2
src/font/standard_colors.hpp
View file

@ -15,7 +15,7 @@
#ifndef FONT_STANDARD_COLORS_HPP
#define FONT_STANDARD_COLORS_HPP
#include "sdl/color.hpp"
#include "color.hpp"
namespace font {

2
src/font/text.hpp
View file

@ -16,7 +16,7 @@
#define TEXT_HPP_INCLUDED
#include "font/font_options.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "sdl/utils.hpp"
#include "serialization/unicode_types.hpp"

2
src/font/text_formatting.cpp
View file

@ -16,7 +16,7 @@
#include "formatter.hpp"
#include "game_config.hpp"
#include "gettext.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include <iomanip>

2
src/font/text_formatting.hpp
View file

@ -14,7 +14,7 @@
#ifndef TEXT_FORMATTING_HPP_INCLUDED
#define TEXT_FORMATTING_HPP_INCLUDED
#include "sdl/color.hpp"
#include "color.hpp"
#include <SDL.h>
#include <string>

2
src/font/text_surface.hpp
View file

@ -16,7 +16,7 @@
#define FONT_TEXT_SURFACE_HPP
#include "font_id.hpp" // for text_chunk
#include "sdl/color.hpp"
#include "color.hpp"
#include <SDL_ttf.h>

2
src/formula/function.cpp
View file

@ -21,7 +21,7 @@
#include "game_display.hpp"
#include "game_config.hpp"
#include "log.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include <boost/math/constants/constants.hpp>
using namespace boost::math::constants;

2
src/game_config.hpp
View file

@ -18,7 +18,7 @@ class config;
class version_info;
class color_range;
#include "sdl/color.hpp"
#include "color.hpp"
#include "tstring.hpp"
#include <vector>

2
src/game_display.cpp
View file

@ -39,7 +39,7 @@
#include "reports.hpp"
#include "resources.hpp"
#include "tod_manager.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "sound.hpp"
#include "synced_context.hpp"
#include "terrain/type_data.hpp"

11
src/gettext_boost.cpp
View file

@ -25,13 +25,18 @@
#include <boost/thread.hpp>
#include <set>
#ifdef __GNUC__
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#elif defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable: 4714)
#endif
#include "spirit_po.hpp"
#ifdef __GNUC__
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#define DBG_G LOG_STREAM(debug, lg::general())
@ -134,7 +139,7 @@ namespace
extra_messages_.emplace(get_base().domain(domain), cat);
} catch(spirit_po::catalog_exception& e) {
throw_po_error(lang_name_long, domain, e.what());
} catch(std::ios::failure& e) {
} catch(std::ios::failure&) {
throw_po_error(lang_name_long, domain, strerror(errno));
}
}

2
src/gui/core/window_builder.hpp
View file

@ -17,7 +17,7 @@
#include "gui/auxiliary/typed_formula.hpp"
#include "gui/widgets/grid.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "utils/functional.hpp"

2
src/gui/dialogs/editor/edit_label.hpp
View file

@ -17,7 +17,7 @@
#include "gui/dialogs/modal_dialog.hpp"
#include "map/label.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
namespace gui2
{

2
src/gui/dialogs/unit_attack.cpp
View file

@ -38,7 +38,7 @@
#include "language.hpp"
#include "font/marked-up_text.hpp"
#include "resources.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "team.hpp"
#include "units/unit.hpp"

2
src/gui/widgets/helper.cpp
View file

@ -19,7 +19,7 @@
#include "gui/core/log.hpp"
#include "gui/core/point.hpp"
#include "gui/widgets/settings.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "sdl/rect.hpp"
#include "formula/callable.hpp"
#include "formula/string_utils.hpp"

2
src/gui/widgets/helper.hpp
View file

@ -17,7 +17,7 @@
#include "font/text.hpp"
#include "global.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include <pango/pango-layout.h>

2
src/gui/widgets/widget.hpp
View file

@ -18,7 +18,7 @@
#include "gui/core/event/dispatcher.hpp"
#include "gui/core/point.hpp"
#include "gui/widgets/event_executor.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include <string>

2
src/help/help_impl.cpp
View file

@ -43,7 +43,7 @@
#include "tstring.hpp" // for t_string, operator<<
#include "units/types.hpp" // for unit_type, unit_type_data, etc
#include "serialization/unicode.hpp" // for iterator
#include "sdl/color.hpp"
#include "color.hpp"
#include <cassert> // for assert
#include <algorithm> // for sort, find, transform, etc

2
src/image_modifications.cpp
View file

@ -19,7 +19,7 @@
#include "image.hpp"
#include "image_modifications.hpp"
#include "log.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "serialization/string_utils.hpp"
#include <map>

2
src/intro.cpp
View file

@ -25,7 +25,7 @@
#include "video.hpp"
#include "gettext.hpp"
#include "font/marked-up_text.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "sdl/rect.hpp"
#include "font/sdl_ttf.hpp"

2
src/map/label.cpp
View file

@ -20,7 +20,7 @@
#include "game_data.hpp"
#include "map/label.hpp"
#include "resources.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "tooltips.hpp"
#include "formula/string_utils.hpp"

3
src/map/label.hpp
View file

@ -17,11 +17,12 @@
#include "font/standard_colors.hpp"
#include "map/location.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "tstring.hpp"
#include <map>
#include <string>
#include <SDL.h>
class config;
class display;

2
src/menu_events.cpp
View file

@ -81,7 +81,7 @@
#include "scripting/game_lua_kernel.hpp"
#include "scripting/plugins/manager.hpp"
#include "sound.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "synced_context.hpp"
#include "terrain/builder.hpp"
#include "units/unit.hpp"

2
src/minimap.cpp
View file

@ -23,7 +23,7 @@
#include "log.hpp"
#include "map/map.hpp"
#include "resources.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "sdl/utils.hpp"
#include "team.hpp"
#include "terrain/type_data.hpp"

2
src/reports.cpp
View file

@ -28,7 +28,7 @@
#include "font/marked-up_text.hpp"
#include "mouse_events.hpp"
#include "reports.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "strftime.hpp"
#include "team.hpp"
#include "tod_manager.hpp"

2
src/scripting/game_lua_kernel.cpp
View file

@ -82,7 +82,7 @@
#include "scripting/lua_team.hpp"
#include "scripting/lua_unit_type.hpp"
#include "scripting/push_check.hpp"
#include "sdl/color.hpp" // for surface
#include "color.hpp" // for surface
#include "sdl/utils.hpp" // for surface
#include "side_filter.hpp" // for side_filter
#include "sound.hpp" // for commit_music_changes, etc

14
src/sdl/utils.cpp
View file

@ -21,7 +21,7 @@
#include "sdl/utils.hpp"
#include "sdl/rect.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "serialization/string_utils.hpp"
#include "video.hpp"
@ -2544,3 +2544,15 @@ std::ostream& operator<<(std::ostream& s, const SDL_Rect& rect)
s << rect.x << ',' << rect.y << " x " << rect.w << ',' << rect.h;
return s;
}
SDL_Color color_t::to_sdl() const {
return {r, g, b, a};
}
color_t::color_t(const SDL_Color& c)
: r(c.r)
, g(c.g)
, b(c.b)
, a(c.a)
{}

2
src/sdl/utils.hpp
View file

@ -18,7 +18,7 @@
#define SDL_UTILS_INCLUDED
#include "color_range.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "util.hpp"
#include <SDL.h>

2
src/team.cpp
View file

@ -29,7 +29,7 @@
#include "resources.hpp"
#include "play_controller.hpp"
#include "game_preferences.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "units/types.hpp"
#include "synced_context.hpp"
#include "whiteboard/side_actions.hpp"

2
src/units/animation.cpp
View file

@ -21,7 +21,7 @@
#include "map/map.hpp"
#include "play_controller.hpp"
#include "resources.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "units/unit.hpp"
#include "units/animation_component.hpp"
#include "units/filter.hpp"

2
src/units/drawer.cpp
View file

@ -21,7 +21,7 @@
#include "halo.hpp"
#include "map/map.hpp"
#include "map/location.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "sdl/utils.hpp"
#include "team.hpp"
#include "units/unit.hpp"

2
src/units/frame.cpp
View file

@ -18,7 +18,7 @@
#include "game_display.hpp"
#include "log.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "sound.hpp"
#include "units/frame.hpp"

2
src/units/udisplay.cpp
View file

@ -25,7 +25,7 @@
#include "log.hpp"
#include "mouse_events.hpp"
#include "resources.hpp"
#include "sdl/color.hpp"
#include "color.hpp"
#include "sound.hpp"
#include "terrain/filter.hpp"
#include "units/unit.hpp"

2
src/units/unit.cpp
View file

@ -36,7 +36,7 @@
#include "random_new.hpp" // for generator, rng
#include "resources.hpp" // for units, gameboard, teams, etc
#include "scripting/game_lua_kernel.hpp" // for game_lua_kernel
#include "sdl/color.hpp"
#include "color.hpp"
#include "synced_context.hpp"
#include "side_filter.hpp" // for side_filter
#include "team.hpp" // for team, get_teams, etc