Merge branch 'master' into campaignd_asio

wesnoth · Jun 17, 2016 · 31bbedd · 31bbedd
2 parents bd304cb + 44fa665
commit 31bbedd
Show file tree

Hide file tree

Showing 38 changed files with 284 additions and 121 deletions.
diff --git a/SConstruct b/SConstruct
@@ -49,7 +49,7 @@ opts.AddVariables(
         "wesnoth,wesnothd", Split("wesnoth wesnothd campaignd cutter exploder test")),
     EnumVariable('build', 'Build variant: debug, release profile or base (no subdirectory)', "release", ["release", "debug", "glibcxx_debug", "profile","base"]),
     PathVariable('build_dir', 'Build all intermediate files(objects, test programs, etc) under this dir', "build", PathVariable.PathAccept),
-    ('extra_flags_config', 'Extra compiler and linker flags to use for configuration and all builds', ""),
+    ('extra_flags_config', "Extra compiler and linker flags to use for configuration and all builds. Whether they're compiler or linker is determined by env.ParseFlags. Unknown flags are compile flags by default. This applies to all extra_flags_* variables", ""),
     ('extra_flags_base', 'Extra compiler and linker flags to use for release builds', ""),
     ('extra_flags_release', 'Extra compiler and linker flags to use for release builds', ""),
     ('extra_flags_debug', 'Extra compiler and linker flags to use for debug builds', ""),
@@ -105,6 +105,7 @@ opts.AddVariables(
     ('cxxtool', 'Set c++ compiler command if not using standard compiler.'),
     EnumVariable('cxx_std', 'Target c++ std version', '11', ['11', '14', '1y']),
     BoolVariable('openmp', 'Enable openmp use.', False),
+    ('sanitize', 'Enable clang and GCC sanitizer functionality. A comma separated list of sanitize suboptions must be passed as value.', ''),
     BoolVariable("fast", "Make scons faster at cost of less precise dependency tracking.", False),
     BoolVariable("lockfile", "Create a lockfile to prevent multiple instances of scons from being run at the same time on this working copy.", False),
     BoolVariable("OS_ENV", "Forward the entire OS environment to scons", False),
@@ -507,6 +508,8 @@ for env in [test_env, client_env, env]:
 
         if env['strict']:
             env.AppendUnique(CCFLAGS = Split("-Werror -Wold-style-cast $(-Wno-unused-local-typedefs$)"))
+        if env['sanitize']:
+            env.AppendUnique(CCFLAGS = ["-fsanitize=" + env["sanitize"]], LINKFLAGS = ["-fsanitize=" + env["sanitize"]])
 
         env["OPT_FLAGS"] = "-O2"
         env["DEBUG_FLAGS"] = Split("-O0 -DDEBUG -ggdb3")

diff --git a/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg b/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
@@ -189,13 +189,15 @@
 
             [store_locations]
                 [not]
-                    terrain=S*
+                    terrain=S*,D*
                 [/not]
 
                 [filter_adjacent_location]
                     x,y=$prison_locations[$i].x,$prison_locations[$i].y
                 [/filter_adjacent_location]
 
+                include_borders=no
+
                 variable=guard_location
             [/store_locations]
 

diff --git a/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg b/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
@@ -420,17 +420,32 @@
             message= _ "Good! Now, we must move onward, north. Tell the villagers to pack their belongings and head west."
         [/message]
 
-        [modify_unit]
+        [store_unit]
             [filter]
                 id=Owaec
             [/filter]
 
+            kill=yes
+            variable=stored_Owaec
+        [/store_unit]
+
+        [unit]
             side=1
-            canrecruit=no
+            id=Owaec
+            name= _ "Owaec"
+            unrenamable=yes
+            x,y=$stored_Owaec.x,$stored_Owaec.y
+            type=$stored_Owaec.type
+            experience=$stored_Owaec.experience
+            profile=portraits/owaec.png
             {IS_HERO}
-        [/modify_unit]
+            random_traits=no
+            [modifications]
+                {TRAIT_LOYAL}
+            [/modifications]
+        [/unit]
 
-        {CLEAR_VARIABLE bandit_villages,bandit_types,villages_visited,boss_found,shodrano_killed}
+        {CLEAR_VARIABLE stored_Owaec,bandit_villages,bandit_types,villages_visited,boss_found,shodrano_killed}
     [/event]
 
     {HOLY_AMULET 2 25}

diff --git a/data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg b/data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg
@@ -57,7 +57,7 @@
         [/ai]
 
         {LOYAL_UNIT () (Dwarvish Guardsman) 33 6} {GUARDIAN}
-        {LOYAL_UNIT () (Dwarvish Guardsman) 41 7} {GUARDIAN}
+        {LOYAL_UNIT () (Dwarvish Guardsman) 40 7} {GUARDIAN}
     [/side]
 
     {LIMIT_CONTEMPORANEOUS_RECRUITS 2 "Dwarvish Steelclad" 2}
@@ -385,6 +385,8 @@
         [/message]
     [/event]
 
+    {HOLY_AMULET 10 2}
+
     [event]
         name=enemies defeated
 

diff --git a/data/campaigns/Eastern_Invasion/utils/character-definitions.cfg b/data/campaigns/Eastern_Invasion/utils/character-definitions.cfg
@@ -42,7 +42,6 @@
     random_traits=no
     unrenamable=yes
     [modifications]
-        {TRAIT_LOYAL}
         {TEAM_COLOR_OVERRIDE () blue}
     [/modifications]
 #enddef
diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
@@ -83,17 +83,17 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
 #enddef
 
     [side]
-	    side=1
+        side=1
         {PLAYABLE}
-        # wmllint: who KALENZ is Kalenz
+        # wmllint: who KALENZ_YOUNG is Kalenz
         {KALENZ_YOUNG}
         save_id=Kalenz
         x=16
         y=15
 
 #ifndef MULTIPLAYER
         [unit]
-            # wmllint: who LANDAR is Landar
+            # wmllint: who LANDAR_YOUNG is Landar
             {LANDAR_YOUNG}
             x=18
             y=15
@@ -139,6 +139,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
     #### /Kalenz side ####
 
     #### Landar's side ####
+    # wmllint: skip-side
     {MP_SIDE 2 (
         {PLAYABLE}
         {LANDAR_YOUNG}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
@@ -70,6 +70,7 @@
     [/event]
     ### /Kalenz's code ###
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         x=20
         y=4

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
@@ -80,6 +80,7 @@
         {PLAYER_GOLD}
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         no_leader=yes
         {PLAYABLE}
@@ -136,6 +137,7 @@
         # wmllint: recognize Galtrid
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 4 (
         no_leader=yes
         previous_save_id=Landar
@@ -1119,9 +1121,9 @@
         {CLEAR_VARIABLE orc_battlefield_strategy}
 
 #ifdef MULTIPLAYER
-		[persistent_carryover_store]
-			scenario_id = LoW_Chapter_One
-		[/persistent_carryover_store]
+        [persistent_carryover_store]
+            scenario_id = LoW_Chapter_One
+        [/persistent_carryover_store]
 #endif
     [/event]
     {DEFAULT_VICTORY 0.5}
@@ -1132,3 +1134,5 @@
 #undef ORC_BATTLEFIELD_EVALUATION
 #undef ORC_BATTLEFIELD_EVALUATION_SUCCESS
 #undef ORC_BATTLEFIELD_EVALUATION_FAILURE
+# wmllint: unwho KALENZ_YOUNG
+# wmllint: unwho LANDAR_YOUNG
diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
@@ -60,12 +60,14 @@ Chapter Two"
 
     [side]
         side=1
+        # wmllint: who KALENZ is Kalenz
         {KALENZ}
         {PLAYABLE}
         save_id=Kalenz
         {PLAYER_GOLD}
 #ifndef MULTIPLAYER
         [unit]
+            # wmllint: who LANDAR is Landar
             {LANDAR}
             x=16
             y=29
@@ -76,13 +78,15 @@ Chapter Two"
 
     #Landar's side
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         {LANDAR}
         save_id=Landar
         {PLAYABLE}
         {PLAYER_GOLD}
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         no_leader=yes
         save_id=Cleodil
@@ -186,9 +190,9 @@ Chapter Two"
         [/objectives]
 
 #ifdef MULTIPLAYER
-		[persistent_carryover_unstore]
-			scenario_id = LoW_Chapter_One
-		[/persistent_carryover_unstore]
+        [persistent_carryover_unstore]
+            scenario_id = LoW_Chapter_One
+        [/persistent_carryover_unstore]
 #endif
         # wmllint: who RECALL_LOYALS is Huraldur
         #{RECALL_LOYALS}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
@@ -86,6 +86,7 @@
 #endif
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         no_leader=yes
         {PLAYABLE}
@@ -98,6 +99,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         no_leader=yes
         {PLAYABLE}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
@@ -70,6 +70,7 @@
         {RECALL_LOYALS}
     [/event]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         {PLAYABLE}
         save_id=Landar
@@ -81,6 +82,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         {PLAYABLE}
         save_id=Cleodil

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
@@ -101,6 +101,7 @@
         {RECALL_LOYALS}
     [/event]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         no_leader=yes
         {PLAYABLE}
@@ -114,6 +115,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         no_leader=yes
         {PLAYABLE}
@@ -163,6 +165,7 @@
 #endif
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 5 (
         {PLAYABLE}
         {EL_ISOMITHIR}
@@ -173,6 +176,7 @@
         {GOLD 133 100 65}
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 6 (
         {PLAYABLE}
         {ERADION}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
@@ -139,9 +139,8 @@
     [event]
         name=victory
 
-		[persistent_carryover_store]
-			scenario_id = LoW_Chapter_Two
-		[/persistent_carryover_store]
-
+        [persistent_carryover_store]
+            scenario_id = LoW_Chapter_Two
+        [/persistent_carryover_store]
     [/event]
 [/scenario]
diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
@@ -80,6 +80,7 @@ Chapter Three"
     [/side]
 
     #Landar's side
+    # wmllint: skip-side
     {MP_SIDE 2 (
         {PLAYABLE}
         save_id=Landar
@@ -93,6 +94,7 @@ Chapter Three"
     )}
 
     #Olurf's side
+    # wmllint: skip-side
     {MP_SIDE 3 (
         {PLAYABLE}
         save_id=Olurf
@@ -108,6 +110,7 @@ Chapter Three"
     )}
 
     #Cleodil's side
+    # wmllint: skip-side
     {MP_SIDE 4 (
         {PLAYABLE}
         save_id=Cleodil
@@ -226,9 +229,9 @@ Chapter Three"
         # wmllint: recognize Anduilas
 
 #ifdef MULTIPLAYER
-		[persistent_carryover_unstore]
-			scenario_id = LoW_Chapter_Two
-		[/persistent_carryover_unstore]
+        [persistent_carryover_unstore]
+            scenario_id = LoW_Chapter_Two
+        [/persistent_carryover_unstore]
 #endif
 
 #define LEAVE_BEHIND_L3 NAME SIDE

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
@@ -69,6 +69,7 @@
 #endif
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         no_leader=yes
         {MULTIPLAYER_GOLD}
@@ -80,6 +81,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         no_leader=yes
         {MULTIPLAYER_GOLD}
@@ -91,6 +93,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 4 (
         no_leader=yes
         {MULTIPLAYER_GOLD}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
@@ -72,6 +72,7 @@
 #endif
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         {PLAYABLE}
         save_id=Landar
@@ -82,6 +83,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         {PLAYABLE}
         save_id=Olurf
@@ -92,6 +94,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 4 (
         {PLAYABLE}
         save_id=Cleodil

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg
@@ -291,9 +291,9 @@
 
     [event]
         name=victory
-		[persistent_carryover_store]
-			scenario_id = LoW_Chapter_Three
-		[/persistent_carryover_store]
+        [persistent_carryover_store]
+            scenario_id = LoW_Chapter_Three
+        [/persistent_carryover_store]
     [/event]
 #endif
 [/scenario]