Allow filter formulas to use a number of previously FormulaAI-exclusi…

…ve functions

changelog

@@ -36,6 +36,10 @@ Version 1.13.8+dev:
    * Add owner key to terrain space callable, for villages
    * Location formulas in [tunnel] now have a teleport_unit variable
    * Fix a crash when attempting to call a non-existent function
+   * The following previously FormulaAI-exclusive functions are now also available
+     in filter formulas (SUF, SLF, SSF, SWF):
+	 adjacent_locs, location_in_radius, get_unit_type, unit_at, defense_on,
+	 chance_to_hit, movement_cost
  * WML Engine
    * If ai_algorithm is used in [modify_side][ai], it now replaces the whole AI
      with the contents of [modify_side][ai], instead of appending these parameters.

projectfiles/VC12/wesnoth.vcxproj

@@ -1088,6 +1088,12 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Formula\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Formula\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\src\formula\function_gamestate.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Formula\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Formula\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Formula\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Formula\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\src\formula\string_utils.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Formula\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Formula\</ObjectFileName>
@@ -3596,6 +3602,7 @@
     <ClInclude Include="..\..\src\formula\debugger_fwd.hpp" />
     <ClInclude Include="..\..\src\formula\formula.hpp" />
     <ClInclude Include="..\..\src\formula\formula_fwd.hpp" />
+    <ClInclude Include="..\..\src\formula\function_gamestate.hpp" />
     <ClInclude Include="..\..\src\formula\function.hpp" />
     <ClInclude Include="..\..\src\formula\string_utils.hpp" />
     <ClInclude Include="..\..\src\formula\tokenizer.hpp" />

projectfiles/VC12/wesnoth.vcxproj.filters

@@ -1538,6 +1538,9 @@
     <ClCompile Include="..\..\src\preferences\lobby.cpp">
       <Filter>Preferences</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\formula\function_gamestate.cpp">
+      <Filter>Formula</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\addon\client.hpp">
@@ -2982,6 +2985,9 @@
     <ClInclude Include="..\..\src\preferences\lobby.hpp">
       <Filter>Preferences</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\formula\function_gamestate.hpp">
+      <Filter>Formula</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\tests\test_sdl_utils.hpp">

source_lists/wesnoth

@@ -108,6 +108,7 @@ formula/debugger.cpp
 formula/debugger_fwd.cpp
 formula/formula.cpp
 formula/function.cpp
+formula/function_gamestate.cpp
 formula/string_utils.cpp
 formula/tokenizer.cpp
 formula/variant.cpp