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

Merge branch 'master' of https://github.com/wesnoth/wesnoth

Browse source
This commit is contained in:
Chris Beck 2014-10-10 18:11:34 -04:00
commit c32baa0666
15 changed files with 75 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -45,6 +45,8 @@ Version 1.13.0-dev:
* Eastern Invasion:
* In 'Captured', stolen gold won't be mentioned if the player had no
carryover gold.
* Heir to the Throne:
* Fixed missing message in 'The Siege of Elensefar'.
* Northern Rebirth:
* Fixed Sister Thera and Father Morvin respawning into the recall list if
the other is on the north or west map edges.

2
data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
View file

@ -187,7 +187,7 @@
message= _ "Here come the elves! Our newly forged alliance with the orcs will give us the power to crush them with ease!"
[/message]
[message]
role=Konrad
speaker=Konrad
message= _ "We must take the city, and destroy the evil undead before reinforcements arrive!"
[/message]
[/event]

3
data/core/about.cfg
View file

@ -1008,6 +1008,9 @@
email = "eugeni.stepanov@gmail.com"
comment = "NativeClient port"
[/entry]
[entry]
name = "Evgeny Kapun"
[/entry]
[entry]
name = "FAAB"
[/entry]

20
projectfiles/CodeBlocks/wesnoth.cbp
View file

@ -171,6 +171,8 @@
<Unit filename="..\..\src\ai\recruitment\recruitment.hpp" />
<Unit filename="..\..\src\ai\registry.cpp" />
<Unit filename="..\..\src\ai\registry.hpp" />
<Unit filename="..\..\src\ai\simulated_actions.cpp" />
<Unit filename="..\..\src\ai\simulated_actions.hpp" />
<Unit filename="..\..\src\ai\testing.cpp" />
<Unit filename="..\..\src\ai\testing.hpp" />
<Unit filename="..\..\src\ai\testing\aspect_attacks.cpp" />
@ -271,9 +273,9 @@
<Unit filename="..\..\src\editor\action\mouse\mouse_action_unit.hpp" />
<Unit filename="..\..\src\editor\action\mouse\mouse_action_village.cpp" />
<Unit filename="..\..\src\editor\action\mouse\mouse_action_village.hpp" />
<Unit filename="..\..\src\editor\controller\editor_controller.cpp" />
<Unit filename="..\..\src\editor\controller\editor_controller.hpp" />
<Unit filename="..\..\src\editor\editor_common.hpp" />
<Unit filename="..\..\src\editor\editor_controller.cpp" />
<Unit filename="..\..\src\editor\editor_controller.hpp" />
<Unit filename="..\..\src\editor\editor_display.cpp" />
<Unit filename="..\..\src\editor\editor_display.hpp" />
<Unit filename="..\..\src\editor\editor_main.cpp" />
@ -380,14 +382,14 @@
<Unit filename="..\..\src\game_preferences_display.cpp" />
<Unit filename="..\..\src\game_state.cpp" />
<Unit filename="..\..\src\game_state.hpp" />
<Unit filename="..\..\src\generators\cavegen.cpp" />
<Unit filename="..\..\src\generators\cavegen.hpp" />
<Unit filename="..\..\src\generators\cave_map_generator.cpp" />
<Unit filename="..\..\src\generators\cave_map_generator.hpp" />
<Unit filename="..\..\src\generators\default_map_generator.cpp" />
<Unit filename="..\..\src\generators\default_map_generator.hpp" />
<Unit filename="..\..\src\generators\map_create.cpp" />
<Unit filename="..\..\src\generators\map_create.hpp" />
<Unit filename="..\..\src\generators\mapgen.cpp" />
<Unit filename="..\..\src\generators\mapgen.hpp" />
<Unit filename="..\..\src\generators\mapgen_dialog.cpp" />
<Unit filename="..\..\src\generators\mapgen_dialog.hpp" />
<Unit filename="..\..\src\generators\map_generator.cpp" />
<Unit filename="..\..\src\generators\map_generator.hpp" />
<Unit filename="..\..\src\generators\yamg\ya_mapgen.cpp" />
<Unit filename="..\..\src\generators\yamg\ya_mapgen.hpp" />
<Unit filename="..\..\src\generators\yamg\yamg_decls.hpp" />
@ -563,6 +565,8 @@
<Unit filename="..\..\src\gui\dialogs\campaign_difficulty.hpp" />
<Unit filename="..\..\src\gui\dialogs\campaign_selection.cpp" />
<Unit filename="..\..\src\gui\dialogs\campaign_selection.hpp" />
<Unit filename="..\..\src\gui\dialogs\campaign_settings.cpp" />
<Unit filename="..\..\src\gui\dialogs\campaign_settings.hpp" />
<Unit filename="..\..\src\gui\dialogs\chat_log.cpp" />
<Unit filename="..\..\src\gui\dialogs\chat_log.hpp" />
<Unit filename="..\..\src\gui\dialogs\core_selection.cpp" />

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

@ -386,7 +386,6 @@
B5599E8E0EC64CF2008DD061 /* SDL_mixer.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B55999240EC61F59008DD061 /* SDL_mixer.framework */; };
B5599E9C0EC68BF2008DD061 /* SDL_ttf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5599E9B0EC68BF2008DD061 /* SDL_ttf.framework */; };
B5599FCB0EC8FBCB008DD061 /* libfreetype.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B5599FC90EC8FBCB008DD061 /* libfreetype.6.dylib */; };
B559A0130EC8FE2E008DD061 /* editor_controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599FFD0EC8FE2E008DD061 /* editor_controller.cpp */; };
B559A0140EC8FE2E008DD061 /* editor_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599FFF0EC8FE2E008DD061 /* editor_display.cpp */; };
B559A0160EC8FE2E008DD061 /* editor_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B559A0030EC8FE2E008DD061 /* editor_main.cpp */; };
B559A0200EC8FEA3008DD061 /* libfreetype.6.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = B5599FC90EC8FBCB008DD061 /* libfreetype.6.dylib */; };
@ -531,7 +530,6 @@
B597C5800FACD6CA00CE81F5 /* mp_cmd_wrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B59915060F20E9FF00BAD4C1 /* mp_cmd_wrapper.cpp */; };
B597C5820FACD6CA00CE81F5 /* about.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599AC60EC62181008DD061 /* about.cpp */; };
B597C5830FACD6CA00CE81F5 /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A0D0EC62181008DD061 /* intro.cpp */; };
B597C5840FACD6CA00CE81F5 /* editor_controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599FFD0EC8FE2E008DD061 /* editor_controller.cpp */; };
B597C5850FACD6CA00CE81F5 /* replay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999BB0EC62181008DD061 /* replay.cpp */; };
B597C5860FACD6CA00CE81F5 /* unit_frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999770EC62181008DD061 /* unit_frame.cpp */; };
B597C5880FACD6CA00CE81F5 /* editor_generate_map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A9BCB40ECA805A002BE442 /* editor_generate_map.cpp */; };
@ -932,6 +930,7 @@
ECA9E67E17F478D600F5DDC4 /* game_paths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA9E67C17F478D600F5DDC4 /* game_paths.cpp */; };
ECAA3FE718E0E4EF002E8998 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECAA3FE518E0E4EF002E8998 /* unicode.cpp */; };
ECAA3FE818E0E4EF002E8998 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECAA3FE518E0E4EF002E8998 /* unicode.cpp */; };
ECB58C8D19E71347007D074F /* editor_controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECB58C8B19E71347007D074F /* editor_controller.cpp */; };
ECBBD73D1928F3F200E434C6 /* terrain_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECBBD73B1928F3F100E434C6 /* terrain_builder.cpp */; };
ECBBD7401928F41500E434C6 /* core_selection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECBBD73E1928F41500E434C6 /* core_selection.cpp */; };
ECC8F41B185FE2E1004AC3BE /* format_time_summary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECC8F419185FE2E1004AC3BE /* format_time_summary.cpp */; };
@ -1673,8 +1672,6 @@
B5599FBA0EC8F748008DD061 /* libpangocairo-1.0.0.2101.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libpangocairo-1.0.0.2101.2.dylib"; path = "lib/libpangocairo-1.0.0.2101.2.dylib"; sourceTree = "<group>"; };
B5599FC90EC8FBCB008DD061 /* libfreetype.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfreetype.6.dylib; path = lib/libfreetype.6.dylib; sourceTree = "<group>"; };
B5599FFC0EC8FE2E008DD061 /* editor_common.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = editor_common.hpp; sourceTree = "<group>"; };
B5599FFD0EC8FE2E008DD061 /* editor_controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editor_controller.cpp; sourceTree = "<group>"; };
B5599FFE0EC8FE2E008DD061 /* editor_controller.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = editor_controller.hpp; sourceTree = "<group>"; };
B5599FFF0EC8FE2E008DD061 /* editor_display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editor_display.cpp; sourceTree = "<group>"; };
B559A0000EC8FE2E008DD061 /* editor_display.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = editor_display.hpp; sourceTree = "<group>"; };
B559A0030EC8FE2E008DD061 /* editor_main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editor_main.cpp; sourceTree = "<group>"; };
@ -2176,6 +2173,8 @@
ECA9E67D17F478D600F5DDC4 /* game_paths.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = game_paths.hpp; sourceTree = "<group>"; };
ECAA3FE518E0E4EF002E8998 /* unicode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unicode.cpp; sourceTree = "<group>"; };
ECAA3FE618E0E4EF002E8998 /* unicode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = unicode.hpp; sourceTree = "<group>"; };
ECB58C8B19E71347007D074F /* editor_controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = editor_controller.cpp; path = controller/editor_controller.cpp; sourceTree = "<group>"; };
ECB58C8C19E71347007D074F /* editor_controller.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = editor_controller.hpp; path = controller/editor_controller.hpp; sourceTree = "<group>"; };
ECBBD73B1928F3F100E434C6 /* terrain_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = terrain_builder.cpp; sourceTree = "<group>"; };
ECBBD73C1928F3F100E434C6 /* terrain_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = terrain_builder.hpp; sourceTree = "<group>"; };
ECBBD73E1928F41500E434C6 /* core_selection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = core_selection.cpp; sourceTree = "<group>"; };
@ -3438,6 +3437,8 @@
B5599FF60EC8FE2E008DD061 /* editor */ = {
isa = PBXGroup;
children = (
ECB58C8B19E71347007D074F /* editor_controller.cpp */,
ECB58C8C19E71347007D074F /* editor_controller.hpp */,
62D24F261519982500350848 /* toolkit */,
6295C3C5150FC9EB0077D8C5 /* palette */,
6295C3BB150FC9750077D8C5 /* map */,
@ -3445,8 +3446,6 @@
B561F38F104B11F7001369F5 /* editor_preferences.cpp */,
B561F390104B11F7001369F5 /* editor_preferences.hpp */,
B5599FFC0EC8FE2E008DD061 /* editor_common.hpp */,
B5599FFD0EC8FE2E008DD061 /* editor_controller.cpp */,
B5599FFE0EC8FE2E008DD061 /* editor_controller.hpp */,
B5599FFF0EC8FE2E008DD061 /* editor_display.cpp */,
B559A0000EC8FE2E008DD061 /* editor_display.hpp */,
B559A0030EC8FE2E008DD061 /* editor_main.cpp */,
@ -4328,7 +4327,6 @@
B5599B8E0EC62181008DD061 /* attack_prediction_display.cpp in Sources */,
B5599B910EC62181008DD061 /* attack_prediction.cpp in Sources */,
EC89A13B1879D17D00A3B0B1 /* loadlib.cpp in Sources */,
B559A0130EC8FE2E008DD061 /* editor_controller.cpp in Sources */,
B559A0140EC8FE2E008DD061 /* editor_display.cpp in Sources */,
B559A0160EC8FE2E008DD061 /* editor_main.cpp in Sources */,
B5A9BD320ECA805A002BE442 /* addon_connect.cpp in Sources */,
@ -4529,6 +4527,7 @@
B52EE88B1213589100CFBDAB /* data_manage.cpp in Sources */,
B52EE88C1213589100CFBDAB /* unit_attack.cpp in Sources */,
B52EE893121358E100CFBDAB /* progress_bar.cpp in Sources */,
ECB58C8D19E71347007D074F /* editor_controller.cpp in Sources */,
EC4D40AF17FCCF14002E7C81 /* strftime.cpp in Sources */,
EC89A1341879D17D00A3B0B1 /* lfunc.cpp in Sources */,
EC48D75917F318DA00DE80BF /* mp_game_utils.cpp in Sources */,
@ -4798,7 +4797,6 @@
B597C5800FACD6CA00CE81F5 /* mp_cmd_wrapper.cpp in Sources */,
B597C5820FACD6CA00CE81F5 /* about.cpp in Sources */,
B597C5830FACD6CA00CE81F5 /* intro.cpp in Sources */,
B597C5840FACD6CA00CE81F5 /* editor_controller.cpp in Sources */,
B597C5850FACD6CA00CE81F5 /* replay.cpp in Sources */,
B597C5860FACD6CA00CE81F5 /* unit_frame.cpp in Sources */,
B597C5880FACD6CA00CE81F5 /* editor_generate_map.cpp in Sources */,

2
src/CMakeLists.txt
View file

@ -731,6 +731,7 @@ set(wesnoth-main_SRC
editor/action/mouse/mouse_action_unit.cpp
editor/action/mouse/mouse_action_village.cpp
editor/action/mouse/mouse_action_select.cpp
editor/controller/editor_controller.cpp
editor/map/editor_map.cpp
editor/map/map_context.cpp
editor/map/map_fragment.cpp
@ -741,7 +742,6 @@ set(wesnoth-main_SRC
editor/palette/item_palette.cpp
editor/palette/terrain_palettes.cpp
editor/palette/unit_palette.cpp
editor/editor_controller.cpp
editor/editor_display.cpp
editor/editor_main.cpp
editor/editor_preferences.cpp

2
src/SConscript
View file

@ -252,6 +252,7 @@ wesnoth_sources = Split("""
editor/action/mouse/mouse_action_village.cpp
editor/action/mouse/mouse_action_item.cpp
editor/action/mouse/mouse_action_select.cpp
editor/controller/editor_controller.cpp
editor/map/editor_map.cpp
editor/map/map_context.cpp
editor/map/map_fragment.cpp
@ -262,7 +263,6 @@ wesnoth_sources = Split("""
editor/palette/unit_palette.cpp
editor/palette/item_palette.cpp
editor/palette/palette_manager.cpp
editor/editor_controller.cpp
editor/editor_display.cpp
editor/editor_main.cpp
editor/editor_preferences.cpp

2
src/animated.tpp
View file

@ -13,7 +13,7 @@
*/
/**
* @file animated.i
* @file animated.tpp
* Templates related to animations.
*/

18
src/editor/editor_controller.cpp → src/editor/controller/editor_controller.cpp
View file

@ -27,7 +27,7 @@
#include "editor/action/mouse/mouse_action.hpp"
#include "editor_preferences.hpp"
#include "editor/editor_preferences.hpp"
#include "gui/dialogs/edit_text.hpp"
#include "gui/dialogs/editor/custom_tod.hpp"
@ -39,14 +39,14 @@
#include "dialogs.hpp"
#include "resources.hpp"
#include "../clipboard.hpp"
#include "../game_preferences.hpp"
#include "../gettext.hpp"
#include "../leader_scroll_dialog.hpp"
#include "../preferences_display.hpp"
#include "../sound.hpp"
#include "../unit.hpp"
#include "../unit_animation_component.hpp"
#include "../../clipboard.hpp"
#include "../../game_preferences.hpp"
#include "../../gettext.hpp"
#include "../../leader_scroll_dialog.hpp"
#include "../../preferences_display.hpp"
#include "../../sound.hpp"
#include "../../unit.hpp"
#include "../../unit_animation_component.hpp"
#include "halo.hpp"

8
src/editor/editor_controller.hpp → src/editor/controller/editor_controller.hpp
View file

@ -22,10 +22,10 @@
#include "editor/map/map_fragment.hpp"
#include "editor/toolkit/editor_toolkit.hpp"
#include "../controller_base.hpp"
#include "../help.hpp"
#include "../mouse_handler_base.hpp"
#include "../tooltips.hpp"
#include "../../controller_base.hpp"
#include "../../help.hpp"
#include "../../mouse_handler_base.hpp"
#include "../../tooltips.hpp"
#include "sound_music_track.hpp"

2
src/editor/editor_main.cpp
View file

@ -13,7 +13,7 @@
*/
#define GETTEXT_DOMAIN "wesnoth-editor"
#include "editor_controller.hpp"
#include "controller/editor_controller.hpp"
#include "../construct_dialog.hpp"
#include "../gettext.hpp"

2
src/editor/map/context_manager.cpp
View file

@ -27,7 +27,7 @@
#include "map_context.hpp"
#include "editor/action/action.hpp"
#include "editor/editor_controller.hpp"
#include "editor/controller/editor_controller.hpp"
#include "editor/editor_preferences.hpp"
#include "gui/dialogs/editor_generate_map.hpp"

28
src/game_preferences.cpp
View file

@ -30,6 +30,11 @@
#include "wml_exception.hpp"
#include <boost/foreach.hpp>
#include <cassert>
#ifdef _WIN32
#include <windows.h> //GetUserName
#endif
static lg::log_domain log_config("config");
#define ERR_CFG LOG_STREAM(err , log_config)
@ -413,12 +418,31 @@ void set_wrap_login(bool wrap)
preferences::set("login_is_wrapped", wrap);
}
static std::string get_system_username()
{
std::string res;
#ifdef _WIN32
wchar_t buffer[300];
DWORD size = 300;
if(GetUserNameW(buffer,&size)) {
//size includes a terminating null character.
assert(size > 0);
res = unicode_cast<utf8::string>(utf16::string(buffer, buffer + size - 1));
}
#else
if(char* const login = getenv("USER")) {
res = login;
}
#endif
return res;
}
std::string login()
{
const std::string res = preferences::get("login");
if(res.empty() || res == EMPTY_WRAPPED_STRING) {
char* const login = getenv("USER");
if(login != NULL) {
const std::string& login = get_system_username();
if(!login.empty()) {
return login;
}

12
src/serialization/unicode.cpp
View file

@ -190,15 +190,15 @@ namespace utf16 {
ucs4::char_t iterator_implementation::get_next_char(utf16::string::const_iterator& start, const utf16::string::const_iterator& end)
{
const int32_t last10 = 0x3FF;
const int32_t type_filter = 0xFC00;
const int32_t type_lead = 0xD800;
const int32_t type_trail = 0xDC00;
const ucs4::char_t last10 = 0x3FF;
const ucs4::char_t type_filter = 0xFC00;
const ucs4::char_t type_lead = 0xD800;
const ucs4::char_t type_trail = 0xDC00;
assert(start != end);
uint32_t current_char = static_cast<uint16_t>(*start);
ucs4::char_t current_char = static_cast<uint16_t>(*start);
++start;
uint32_t type = current_char & type_filter;
ucs4::char_t type = current_char & type_filter;
if(type == type_trail)
{
//found trail without head

2
src/tod_manager.cpp
View file

@ -76,7 +76,7 @@ template <typename T>
struct greater
{
greater(T val) : value (val) {}
bool operator () (T v2)
bool operator () (T v2) const
{
return value < v2;
}