From 3a3984e1dd4bd076d9e30624183d5953dead4c66 Mon Sep 17 00:00:00 2001 From: aquileia Date: Fri, 14 Mar 2014 23:18:15 +0100 Subject: [PATCH 1/6] add missing header to util.hpp --- src/util.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util.hpp b/src/util.hpp index 31f11c2d1bab..eb450a2163bf 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -25,6 +25,7 @@ #include // cmath may not provide round() #include #include +#include template inline bool is_even(T num) { return num % 2 == 0; } From 3dea88709594b8dec9c3912ac5345ca5d69ab8ca Mon Sep 17 00:00:00 2001 From: aquileia Date: Fri, 14 Mar 2014 23:18:53 +0100 Subject: [PATCH 2/6] fix indentation of macros in lobby_main.cfg --- data/gui/default/window/lobby_main.cfg | 30 +++++++++++++++----------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/data/gui/default/window/lobby_main.cfg b/data/gui/default/window/lobby_main.cfg index 88a1b0640cd1..8a8695fc6522 100644 --- a/data/gui/default/window/lobby_main.cfg +++ b/data/gui/default/window/lobby_main.cfg @@ -4,29 +4,35 @@ ### #define HORIZONTAL_BEGIN - [grid][row] - [column] +[grid] + [row] + [column] #enddef #define HORIZONTAL_SEP - [/column] - [column] + [/column] + [column] #enddef #define HORIZONTAL_END - [/column] - [/row][/grid] + [/column] + [/row] +[/grid] #enddef #define VERTICAL_BEGIN - [grid] - [row][column] +[grid] + [row] + [column] #enddef #define VERTICAL_SEP - [/column][/row] - [row][column] + [/column] + [/row] + [row] + [column] #enddef #define VERTICAL_END - [/column][/row] - [/grid] + [/column] + [/row] +[/grid] #enddef #define GAMELISTBOX_HEADER_LABEL ID LABEL From f3bfa19b4ad423824f41bafb589bc948b33f4f61 Mon Sep 17 00:00:00 2001 From: aquileia Date: Fri, 14 Mar 2014 23:19:35 +0100 Subject: [PATCH 3/6] add GUI tag list for Vim syntax highlighting --- data/tools/vim/wesml.vim | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/data/tools/vim/wesml.vim b/data/tools/vim/wesml.vim index cf70d74e62cf..ef916851e1a0 100644 --- a/data/tools/vim/wesml.vim +++ b/data/tools/vim/wesml.vim @@ -89,7 +89,7 @@ syn match wesmlMacroName display /{\@<=[^ }]\+/ contained contains=wesmlIncludeM " Tag " """"""" " A tag is of the form : \[\s*[+/]\?\s*\w\+\s*\] -syn match wesmlTag display /\[[^]]\+\]/ contains=wesmlTagMark,wesmlStdTag,wesmlTagError +syn match wesmlTag display /\[[^]]\+\]/ contains=wesmlTagMark,wesmlStdTag,wesmlTagError,wesmlGUITag syn match wesmlTagMark display /\[\s*[+/]\?\|\]/ contained syn match wesmlTagError display "\[\s*\([^a-zA-Z_\]/+ ]\|\(\w\+\([^a-zA-Z_\] ]\|\s\+[^\] ]\+\)\|[/+]\(\s*[^\] ]\+\s\+[^\] ]\+\|\s*\w*[^a-zA-Z_ \]]\+\)\)\)[^\]]*\]" contained @@ -195,6 +195,31 @@ syn keyword wesmlStdTag contained unit_traits unit_type unit_weapons unit_xp uni syn keyword wesmlStdTag contained unpetrify unstore_unit upkeep variable variables syn keyword wesmlStdTag contained village villages volume while wml_message +" GUI tags, listed via grep "\[[[:lower:]_-]\+\]" data/gui/default/w*/*.cfg -ho | sort -u +" image is already a standard tag +syn keyword wesmlGUITag contained background blur button button_definition circle +syn keyword wesmlGUITag contained column content definition draw drawing +syn keyword wesmlGUITag contained drawing_definition foreground grid header +syn keyword wesmlGUITag contained helptip horizontal_listbox_definition horizontal_scrollbar horizontal_scrollbar_definition +syn keyword wesmlGUITag contained image_definition instance item_definition +syn keyword wesmlGUITag contained label label_definition layer line linked_group +syn keyword wesmlGUITag contained list_data list_definition listbox listbox_definition main +syn keyword wesmlGUITag contained matrix matrix_definition minimap minimap_definition +syn keyword wesmlGUITag contained multi_page multi_page_definition num_box node node_definition +syn keyword wesmlGUITag contained page_definition pane panel panel_definition password_box pre_commit +syn keyword wesmlGUITag contained progress_bar progress_bar_definition rectangle repeating_button repeating_button_definition +syn keyword wesmlGUITag contained resolution row scroll_label scroll_label_definition +syn keyword wesmlGUITag contained scrollbar_panel scrollbar_panel_definition slider slider_definition +syn keyword wesmlGUITag contained spacer spacer_definition stack stacked_widget stacked_widget_definition +syn keyword wesmlGUITag contained state_disabled state_disabled_selected state_enabled state_enabled_selected +syn keyword wesmlGUITag contained state_focussed state_focussed_selected state_pressed text +syn keyword wesmlGUITag contained text_box text_box_definition toggle_button toggle_button_definition +syn keyword wesmlGUITag contained toggle_panel toggle_panel_definition tooltip tree_view tree_view_definition +syn keyword wesmlGUITag contained vertical_scrollbar vertical_scrollbar_definition viewport +syn keyword wesmlGUITag contained widget window window_definition + + + """"""""""""" " Highlight " @@ -243,3 +268,4 @@ hi def link wesmlFormulaOperator Function hi def link wesmlFormulaString String hi def link wesmlStdTag Statement +hi def link wesmlGUITag Statement From bb6bfdcb7deab7f8170f3a49a2c3b48f6791e3ba Mon Sep 17 00:00:00 2001 From: aquileia Date: Fri, 14 Mar 2014 23:24:41 +0100 Subject: [PATCH 4/6] delete deprecated NDEBUG flag from VC project --- projectfiles/VC9/liblua.vcproj | 4 ++-- projectfiles/VC9/wesnoth.vcproj | 6 +++--- projectfiles/VC9/wesnothd.vcproj | 4 ++-- projectfiles/VC9/wesnothlib.vcproj | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projectfiles/VC9/liblua.vcproj b/projectfiles/VC9/liblua.vcproj index e438b7a47f23..20b15943c404 100644 --- a/projectfiles/VC9/liblua.vcproj +++ b/projectfiles/VC9/liblua.vcproj @@ -106,7 +106,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" OpenMP="true" @@ -232,7 +232,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" OpenMP="true" diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj index 97b91dc09f88..bd312b81f626 100644 --- a/projectfiles/VC9/wesnoth.vcproj +++ b/projectfiles/VC9/wesnoth.vcproj @@ -126,7 +126,7 @@ EnableIntrinsicFunctions="true" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\..\src" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS" MinimalRebuild="true" RuntimeLibrary="2" BufferSecurityCheck="false" @@ -374,7 +374,7 @@ EnableIntrinsicFunctions="true" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\..\src" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS;MSVC_DO_UNIT_TESTS" + PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS;MSVC_DO_UNIT_TESTS" MinimalRebuild="true" RuntimeLibrary="2" BufferSecurityCheck="false" @@ -464,7 +464,7 @@ EnableIntrinsicFunctions="true" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\..\src" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS" MinimalRebuild="true" RuntimeLibrary="2" BufferSecurityCheck="false" diff --git a/projectfiles/VC9/wesnothd.vcproj b/projectfiles/VC9/wesnothd.vcproj index 879c7d0a4097..b5ff4f3c83f4 100644 --- a/projectfiles/VC9/wesnothd.vcproj +++ b/projectfiles/VC9/wesnothd.vcproj @@ -121,7 +121,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../src" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NOMINMAX;_SCL_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NOMINMAX;_SCL_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" OpenMP="true" @@ -277,7 +277,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../src" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NOMINMAX;_SCL_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NOMINMAX;_SCL_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" OpenMP="true" diff --git a/projectfiles/VC9/wesnothlib.vcproj b/projectfiles/VC9/wesnothlib.vcproj index 03864c1d8ccd..0998e818546f 100644 --- a/projectfiles/VC9/wesnothlib.vcproj +++ b/projectfiles/VC9/wesnothlib.vcproj @@ -108,7 +108,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../src" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" OpenMP="true" @@ -236,7 +236,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../src" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" OpenMP="true" From e5ea7824d18ef0357f4727dfa75fcd698852e8fd Mon Sep 17 00:00:00 2001 From: mattsc Date: Mon, 17 Mar 2014 18:26:24 -0700 Subject: [PATCH 5/6] Patrol Micro AI: fix bug in the attack part of this MAI This was an oversight dating back to the introduction of the [filter] tag as a possible parameter to this Micro AI. A part of the attack code still relied on the id= key being given, although that key is not required any more now. --- changelog | 3 ++- data/ai/micro_ais/cas/ca_patrol.lua | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/changelog b/changelog index 70b0029c3d47..0e45a33771e1 100644 --- a/changelog +++ b/changelog @@ -4,13 +4,14 @@ Version 1.13.0-dev: game had been reloaded (bug #21750). This was a general bug in the RCA AI mechanism and applied to other CAs as well, but it was most visible in the Micro AIs. + * Patrol Micro AI: fixed bug in the attack part of this MAI * Campaigns: * The Hammer of Thursagan: * Fixed missing objective in 'The Court of Karrag'. * Language and i18n: * Updated translations: German, Scottish Gaelic, Slovak * Lua API: - * Fix bug #21761: wesnoth.synchronize_choice will now give a warning when + * Fix bug #21761: wesnoth.synchronize_choice will now give a warning when the table returned by the user-specified function is not completely valid, when wesnoth is running in debug mode (--debug command line flag). * Units: diff --git a/data/ai/micro_ais/cas/ca_patrol.lua b/data/ai/micro_ais/cas/ca_patrol.lua index e387b37109b4..4ba4b9814a84 100644 --- a/data/ai/micro_ais/cas/ca_patrol.lua +++ b/data/ai/micro_ais/cas/ca_patrol.lua @@ -63,7 +63,7 @@ function ca_patrol:execution(ai, cfg, self) -- If so, don't move, but attack that enemy local enemies = wesnoth.get_units { id = cfg.attack, - { "filter_adjacent", { id = cfg.id } }, + { "filter_adjacent", { id = patrol.id } }, { "filter_side", {{ "enemy_of", { side = wesnoth.current.side } }} } } if next(enemies) then break end @@ -72,7 +72,7 @@ function ca_patrol:execution(ai, cfg, self) local unit_on_wp = wesnoth.get_units { x = self.data[patrol.id..'_x'], y = self.data[patrol.id..'_y'], - { "filter_adjacent", { id = cfg.id } } + { "filter_adjacent", { id = patrol.id } } }[1] for i,wp in ipairs(waypoints) do @@ -133,7 +133,7 @@ function ca_patrol:execution(ai, cfg, self) enemies = wesnoth.get_units{ x = waypoints[n_wp][1], y = waypoints[n_wp][2], - { "filter_adjacent", { id = cfg.id } }, + { "filter_adjacent", { id = patrol.id } }, { "filter_side", {{ "enemy_of", { side = wesnoth.current.side } }} } } end @@ -142,7 +142,7 @@ function ca_patrol:execution(ai, cfg, self) if (not next(enemies)) then enemies = wesnoth.get_units{ id = cfg.attack, - { "filter_adjacent", { id = cfg.id } }, + { "filter_adjacent", { id = patrol.id } }, { "filter_side", {{ "enemy_of", { side = wesnoth.current.side } }} } } end From 983f14663d4e44958543afe31f267163a7d4ea58 Mon Sep 17 00:00:00 2001 From: "Ignacio R. Morelle" Date: Tue, 18 Mar 2014 03:05:00 -0300 Subject: [PATCH 6/6] Move unused script to utils/ --- py-compile => utils/py-compile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename py-compile => utils/py-compile (100%) diff --git a/py-compile b/utils/py-compile similarity index 100% rename from py-compile rename to utils/py-compile