Consolidate formula and hotkey files in corresponding dirs
This commit is contained in:
Celtic Minstrel
parent
2682b679cb
commit
fe0df45947
144 changed files with 360 additions and 332 deletions
|
|
@ -223,8 +223,6 @@
|
|||
<Unit filename="../../src/buffered_istream.hpp" />
|
||||
<Unit filename="../../src/build_info.cpp" />
|
||||
<Unit filename="../../src/build_info.hpp" />
|
||||
<Unit filename="../../src/callable_objects.cpp" />
|
||||
<Unit filename="../../src/callable_objects.hpp" />
|
||||
<Unit filename="../../src/carryover.cpp" />
|
||||
<Unit filename="../../src/chat_events.hpp" />
|
||||
<Unit filename="../../src/color_range.cpp" />
|
||||
|
|
@ -344,21 +342,25 @@
|
|||
<Unit filename="../../src/format_time_summary.cpp" />
|
||||
<Unit filename="../../src/format_time_summary.hpp" />
|
||||
<Unit filename="../../src/formatter.hpp" />
|
||||
<Unit filename="../../src/formula.cpp" />
|
||||
<Unit filename="../../src/formula.hpp" />
|
||||
<Unit filename="../../src/formula_callable.hpp" />
|
||||
<Unit filename="../../src/formula_callable_fwd.hpp" />
|
||||
<Unit filename="../../src/formula_debugger.cpp" />
|
||||
<Unit filename="../../src/formula_debugger.hpp" />
|
||||
<Unit filename="../../src/formula_debugger_fwd.cpp" />
|
||||
<Unit filename="../../src/formula_debugger_fwd.hpp" />
|
||||
<Unit filename="../../src/formula_function.cpp" />
|
||||
<Unit filename="../../src/formula_function.hpp" />
|
||||
<Unit filename="../../src/formula_fwd.hpp" />
|
||||
<Unit filename="../../src/formula_string_utils.cpp" />
|
||||
<Unit filename="../../src/formula_string_utils.hpp" />
|
||||
<Unit filename="../../src/formula_tokenizer.cpp" />
|
||||
<Unit filename="../../src/formula_tokenizer.hpp" />
|
||||
<Unit filename="../../src/formula/callable.hpp" />
|
||||
<Unit filename="../../src/formula/callable_fwd.hpp" />
|
||||
<Unit filename="../../src/formula/callable_objects.cpp" />
|
||||
<Unit filename="../../src/formula/callable_objects.hpp" />
|
||||
<Unit filename="../../src/formula/debugger.cpp" />
|
||||
<Unit filename="../../src/formula/debugger.hpp" />
|
||||
<Unit filename="../../src/formula/debugger_fwd.cpp" />
|
||||
<Unit filename="../../src/formula/debugger_fwd.hpp" />
|
||||
<Unit filename="../../src/formula/formula.cpp" />
|
||||
<Unit filename="../../src/formula/formula.hpp" />
|
||||
<Unit filename="../../src/formula/formula_fwd.hpp" />
|
||||
<Unit filename="../../src/formula/function.cpp" />
|
||||
<Unit filename="../../src/formula/function.hpp" />
|
||||
<Unit filename="../../src/formula/string_utils.cpp" />
|
||||
<Unit filename="../../src/formula/string_utils.hpp" />
|
||||
<Unit filename="../../src/formula/tokenizer.cpp" />
|
||||
<Unit filename="../../src/formula/tokenizer.hpp" />
|
||||
<Unit filename="../../src/formula/variant.cpp" />
|
||||
<Unit filename="../../src/formula/variant.hpp" />
|
||||
<Unit filename="../../src/game_board.cpp" />
|
||||
<Unit filename="../../src/game_board.hpp" />
|
||||
<Unit filename="../../src/game_classification.cpp" />
|
||||
|
|
@ -858,19 +860,19 @@
|
|||
<Unit filename="../../src/hotkey/command_executor.hpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_command.cpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_command.hpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_handler_mp.cpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_handler_mp.hpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_handler_replay.cpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_handler_replay.hpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_handler_sp.cpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_handler_sp.hpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_handler.cpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_handler.hpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_item.cpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_item.hpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_manager.cpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_manager.hpp" />
|
||||
<Unit filename="../../src/hotkey/hotkey_preferences_display.cpp" />
|
||||
<Unit filename="../../src/hotkey_handler.cpp" />
|
||||
<Unit filename="../../src/hotkey_handler.hpp" />
|
||||
<Unit filename="../../src/hotkey_handler_mp.cpp" />
|
||||
<Unit filename="../../src/hotkey_handler_mp.hpp" />
|
||||
<Unit filename="../../src/hotkey_handler_replay.cpp" />
|
||||
<Unit filename="../../src/hotkey_handler_replay.hpp" />
|
||||
<Unit filename="../../src/hotkey_handler_sp.cpp" />
|
||||
<Unit filename="../../src/hotkey_handler_sp.hpp" />
|
||||
<Unit filename="../../src/image.cpp" />
|
||||
<Unit filename="../../src/image.hpp" />
|
||||
<Unit filename="../../src/image_modifications.cpp" />
|
||||
|
|
@ -921,8 +923,6 @@
|
|||
<Unit filename="../../src/lua/lzio.h" />
|
||||
<Unit filename="../../src/lua_jailbreak_exception.cpp" />
|
||||
<Unit filename="../../src/lua_jailbreak_exception.hpp" />
|
||||
<Unit filename="../../src/make_enum.cpp" />
|
||||
<Unit filename="../../src/make_enum.hpp" />
|
||||
<Unit filename="../../src/map.cpp" />
|
||||
<Unit filename="../../src/map.hpp" />
|
||||
<Unit filename="../../src/map_exception.hpp" />
|
||||
|
|
@ -1192,7 +1192,11 @@
|
|||
<Unit filename="../../src/util.cpp" />
|
||||
<Unit filename="../../src/util.hpp" />
|
||||
<Unit filename="../../src/utils/boost_function_guarded.hpp" />
|
||||
<Unit filename="../../src/utils/const_clone.hpp" />
|
||||
<Unit filename="../../src/utils/foreach.hpp" />
|
||||
<Unit filename="../../src/utils/iterator.hpp" />
|
||||
<Unit filename="../../src/utils/make_enum.cpp" />
|
||||
<Unit filename="../../src/utils/make_enum.hpp" />
|
||||
<Unit filename="../../src/utils/reference_counter.hpp" />
|
||||
<Unit filename="../../src/utils/sha1.cpp" />
|
||||
<Unit filename="../../src/utils/sha1.hpp" />
|
||||
|
|
|
|||
|
|
@ -17924,10 +17924,26 @@
|
|||
RelativePath="..\..\src\utils\boost_function_guarded.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\utils\const_clone.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\utils\foreach.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\utils\iterator.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\utils\make_enum.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\utils\make_enum.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\utils\reference_counter.hpp"
|
||||
>
|
||||
|
|
@ -24227,14 +24243,6 @@
|
|||
RelativePath="..\..\src\build_info.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\callable_objects.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\callable_objects.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\carryover.cpp"
|
||||
>
|
||||
|
|
@ -24412,55 +24420,75 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula.cpp"
|
||||
RelativePath="..\..\src\formula\formula.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula.hpp"
|
||||
RelativePath="..\..\src\formula\formula.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_callable.hpp"
|
||||
RelativePath="..\..\src\formula\formula_fwd.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_debugger.cpp"
|
||||
RelativePath="..\..\src\formula\callable_objects.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_debugger.hpp"
|
||||
RelativePath="..\..\src\formula\callable_objects.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_debugger_fwd.cpp"
|
||||
RelativePath="..\..\src\formula\callable.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_debugger_fwd.hpp"
|
||||
RelativePath="..\..\src\formula\debugger.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_function.cpp"
|
||||
RelativePath="..\..\src\formula\debugger.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_function.hpp"
|
||||
RelativePath="..\..\src\formula\debugger_fwd.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_string_utils.cpp"
|
||||
RelativePath="..\..\src\formula\debugger_fwd.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_string_utils.hpp"
|
||||
RelativePath="..\..\src\formula\function.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_tokenizer.cpp"
|
||||
RelativePath="..\..\src\formula\function.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula_tokenizer.hpp"
|
||||
RelativePath="..\..\src\formula\string_utils.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula\string_utils.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula\tokenizer.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula\tokenizer.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula\variant.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\formula\variant.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -24580,35 +24608,35 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\hotkey_handler.cpp"
|
||||
RelativePath="..\..\src\hotkey\hotkey_handler.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\hotkey_handler.hpp"
|
||||
RelativePath="..\..\src\hotkey\hotkey_handler.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\hotkey_handler_mp.cpp"
|
||||
RelativePath="..\..\src\hotkey\hotkey_handler_mp.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\hotkey_handler_mp.hpp"
|
||||
RelativePath="..\..\src\hotkey\hotkey_handler_mp.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\hotkey_handler_replay.cpp"
|
||||
RelativePath="..\..\src\hotkey\hotkey_handler_replay.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\hotkey_handler_replay.hpp"
|
||||
RelativePath="..\..\src\hotkey\hotkey_handler_replay.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\hotkey_handler_sp.cpp"
|
||||
RelativePath="..\..\src\hotkey\hotkey_handler_sp.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\hotkey_handler_sp.hpp"
|
||||
RelativePath="..\..\src\hotkey\hotkey_handler_sp.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -24695,14 +24723,6 @@
|
|||
RelativePath="..\..\src\lua_jailbreak_exception.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\make_enum.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\make_enum.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\map.cpp"
|
||||
>
|
||||
|
|
@ -25455,10 +25475,6 @@
|
|||
RelativePath="..\..\src\variable_info_detail.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\variant.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\version.hpp"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -221,9 +221,9 @@
|
|||
B52EE89F1213590500CFBDAB /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8991213590500CFBDAB /* list.cpp */; };
|
||||
B52EE8A01213590500CFBDAB /* progress_bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE89B1213590500CFBDAB /* progress_bar.cpp */; };
|
||||
B52EE8CB121359A600CFBDAB /* arrow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8A1121359A600CFBDAB /* arrow.cpp */; };
|
||||
B52EE8CD121359A600CFBDAB /* formula_debugger_fwd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8A6121359A600CFBDAB /* formula_debugger_fwd.cpp */; };
|
||||
B52EE8CE121359A600CFBDAB /* formula_debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8A8121359A600CFBDAB /* formula_debugger.cpp */; };
|
||||
B52EE8CF121359A600CFBDAB /* formula_string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8AA121359A600CFBDAB /* formula_string_utils.cpp */; };
|
||||
B52EE8CD121359A600CFBDAB /* debugger_fwd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8A6121359A600CFBDAB /* debugger_fwd.cpp */; };
|
||||
B52EE8CE121359A600CFBDAB /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8A8121359A600CFBDAB /* debugger.cpp */; };
|
||||
B52EE8CF121359A600CFBDAB /* string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8AA121359A600CFBDAB /* string_utils.cpp */; };
|
||||
B52EE8D0121359A600CFBDAB /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8AD121359A600CFBDAB /* hash.cpp */; };
|
||||
B52EE8D2121359A600CFBDAB /* lobby_preferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8B2121359A600CFBDAB /* lobby_preferences.cpp */; };
|
||||
B52EE8D6121359A600CFBDAB /* persist_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8B9121359A600CFBDAB /* persist_context.cpp */; };
|
||||
|
|
@ -234,9 +234,9 @@
|
|||
B52EE8DC121359A600CFBDAB /* sound_music_track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8C4121359A600CFBDAB /* sound_music_track.cpp */; };
|
||||
B52EE8DD121359A600CFBDAB /* unit_helper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8C7121359A600CFBDAB /* unit_helper.cpp */; };
|
||||
B52EE8DF121359A600CFBDAB /* arrow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8A1121359A600CFBDAB /* arrow.cpp */; };
|
||||
B52EE8E1121359A600CFBDAB /* formula_debugger_fwd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8A6121359A600CFBDAB /* formula_debugger_fwd.cpp */; };
|
||||
B52EE8E2121359A600CFBDAB /* formula_debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8A8121359A600CFBDAB /* formula_debugger.cpp */; };
|
||||
B52EE8E3121359A600CFBDAB /* formula_string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8AA121359A600CFBDAB /* formula_string_utils.cpp */; };
|
||||
B52EE8E1121359A600CFBDAB /* debugger_fwd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8A6121359A600CFBDAB /* debugger_fwd.cpp */; };
|
||||
B52EE8E2121359A600CFBDAB /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8A8121359A600CFBDAB /* debugger.cpp */; };
|
||||
B52EE8E3121359A600CFBDAB /* string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8AA121359A600CFBDAB /* string_utils.cpp */; };
|
||||
B52EE8E4121359A600CFBDAB /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8AD121359A600CFBDAB /* hash.cpp */; };
|
||||
B52EE8E6121359A600CFBDAB /* lobby_preferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8B2121359A600CFBDAB /* lobby_preferences.cpp */; };
|
||||
B52EE8EA121359A600CFBDAB /* persist_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EE8B9121359A600CFBDAB /* persist_context.cpp */; };
|
||||
|
|
@ -431,8 +431,8 @@
|
|||
B5599B680EC62181008DD061 /* game_preferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A790EC62181008DD061 /* game_preferences.cpp */; };
|
||||
B5599B6A0EC62181008DD061 /* game_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A7E0EC62181008DD061 /* game_display.cpp */; };
|
||||
B5599B6B0EC62181008DD061 /* game_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A800EC62181008DD061 /* game_config.cpp */; settings = {COMPILER_FLAGS = "-DWESNOTH_PATH='\"./\"'"; }; };
|
||||
B5599B6D0EC62181008DD061 /* formula_tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A830EC62181008DD061 /* formula_tokenizer.cpp */; };
|
||||
B5599B6E0EC62181008DD061 /* formula_function.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A860EC62181008DD061 /* formula_function.cpp */; };
|
||||
B5599B6D0EC62181008DD061 /* tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A830EC62181008DD061 /* tokenizer.cpp */; };
|
||||
B5599B6E0EC62181008DD061 /* function.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A860EC62181008DD061 /* function.cpp */; };
|
||||
B5599B700EC62181008DD061 /* formula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A8C0EC62181008DD061 /* formula.cpp */; };
|
||||
B5599B710EC62181008DD061 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A900EC62181008DD061 /* font.cpp */; };
|
||||
B5599B720EC62181008DD061 /* floating_textbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A920EC62181008DD061 /* floating_textbox.cpp */; };
|
||||
|
|
@ -532,7 +532,7 @@
|
|||
B597C5330FACD6CA00CE81F5 /* generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5795A670F05858100EB190E /* generator.cpp */; };
|
||||
B597C5340FACD6CA00CE81F5 /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A9D0EC62181008DD061 /* cursor.cpp */; };
|
||||
B597C5350FACD6CA00CE81F5 /* playsingle_controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999CA0EC62181008DD061 /* playsingle_controller.cpp */; };
|
||||
B597C5370FACD6CA00CE81F5 /* formula_tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A830EC62181008DD061 /* formula_tokenizer.cpp */; };
|
||||
B597C5370FACD6CA00CE81F5 /* tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A830EC62181008DD061 /* tokenizer.cpp */; };
|
||||
B597C5380FACD6CA00CE81F5 /* textbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B559995E0EC62181008DD061 /* textbox.cpp */; };
|
||||
B597C53A0FACD6CA00CE81F5 /* race.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999C00EC62181008DD061 /* race.cpp */; };
|
||||
B597C53B0FACD6CA00CE81F5 /* minimap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999EC0EC62181008DD061 /* minimap.cpp */; };
|
||||
|
|
@ -617,7 +617,7 @@
|
|||
B597C5AD0FACD6CA00CE81F5 /* animated_game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599AB50EC62181008DD061 /* animated_game.cpp */; };
|
||||
B597C5AE0FACD6CA00CE81F5 /* attack_prediction_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599ACA0EC62181008DD061 /* attack_prediction_display.cpp */; };
|
||||
B597C5B00FACD6CA00CE81F5 /* time_of_day.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999870EC62181008DD061 /* time_of_day.cpp */; };
|
||||
B597C5B10FACD6CA00CE81F5 /* formula_function.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A860EC62181008DD061 /* formula_function.cpp */; };
|
||||
B597C5B10FACD6CA00CE81F5 /* function.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A860EC62181008DD061 /* function.cpp */; };
|
||||
B597C5B30FACD6CA00CE81F5 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A9BCB20ECA805A002BE442 /* dialog.cpp */; };
|
||||
B597C5B40FACD6CA00CE81F5 /* scrollpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B559995A0EC62181008DD061 /* scrollpane.cpp */; };
|
||||
B597C5B60FACD6CA00CE81F5 /* unit_map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999730EC62181008DD061 /* unit_map.cpp */; };
|
||||
|
|
@ -1391,10 +1391,10 @@
|
|||
91B6218B1B7670D300B00E0F /* help_menu.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = help_menu.hpp; sourceTree = "<group>"; };
|
||||
91B6218C1B7670D900B00E0F /* help_text_area.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = help_text_area.hpp; sourceTree = "<group>"; };
|
||||
91B6218D1B7670DE00B00E0F /* help_topic_generators.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = help_topic_generators.hpp; sourceTree = "<group>"; };
|
||||
91B6218F1B76717400B00E0F /* hotkey_handler.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = hotkey_handler.hpp; sourceTree = "<group>"; };
|
||||
91B621901B76717B00B00E0F /* hotkey_handler_sp.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = hotkey_handler_sp.hpp; sourceTree = "<group>"; };
|
||||
91B621911B76718000B00E0F /* hotkey_handler_replay.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = hotkey_handler_replay.hpp; sourceTree = "<group>"; };
|
||||
91B621921B76718700B00E0F /* hotkey_handler_mp.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = hotkey_handler_mp.hpp; sourceTree = "<group>"; };
|
||||
91B6218F1B76717400B00E0F /* hotkey_handler.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = hotkey_handler.hpp; path = /Users/seanachi/Documents/Programming/wesnoth/src/hotkey/hotkey_handler.hpp; sourceTree = "<absolute>"; };
|
||||
91B621901B76717B00B00E0F /* hotkey_handler_sp.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = hotkey_handler_sp.hpp; path = /Users/seanachi/Documents/Programming/wesnoth/src/hotkey/hotkey_handler_sp.hpp; sourceTree = "<absolute>"; };
|
||||
91B621911B76718000B00E0F /* hotkey_handler_replay.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = hotkey_handler_replay.hpp; path = /Users/seanachi/Documents/Programming/wesnoth/src/hotkey/hotkey_handler_replay.hpp; sourceTree = "<absolute>"; };
|
||||
91B621921B76718700B00E0F /* hotkey_handler_mp.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = hotkey_handler_mp.hpp; path = /Users/seanachi/Documents/Programming/wesnoth/src/hotkey/hotkey_handler_mp.hpp; sourceTree = "<absolute>"; };
|
||||
91B621931B76720B00B00E0F /* make_enum.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = make_enum.hpp; sourceTree = "<group>"; };
|
||||
91B621941B76722E00B00E0F /* mp_ui_alerts.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = mp_ui_alerts.hpp; sourceTree = "<group>"; };
|
||||
91B621951B76723300B00E0F /* mt_rng.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = mt_rng.hpp; sourceTree = "<group>"; };
|
||||
|
|
@ -1574,12 +1574,12 @@
|
|||
B52EE8A2121359A600CFBDAB /* arrow.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = arrow.hpp; sourceTree = "<group>"; };
|
||||
B52EE8A3121359A600CFBDAB /* asserts.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = asserts.hpp; sourceTree = "<group>"; };
|
||||
B52EE8A5121359A600CFBDAB /* exceptions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = exceptions.hpp; sourceTree = "<group>"; };
|
||||
B52EE8A6121359A600CFBDAB /* formula_debugger_fwd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = formula_debugger_fwd.cpp; sourceTree = "<group>"; };
|
||||
B52EE8A7121359A600CFBDAB /* formula_debugger_fwd.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = formula_debugger_fwd.hpp; sourceTree = "<group>"; };
|
||||
B52EE8A8121359A600CFBDAB /* formula_debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = formula_debugger.cpp; sourceTree = "<group>"; };
|
||||
B52EE8A9121359A600CFBDAB /* formula_debugger.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = formula_debugger.hpp; sourceTree = "<group>"; };
|
||||
B52EE8AA121359A600CFBDAB /* formula_string_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = formula_string_utils.cpp; sourceTree = "<group>"; };
|
||||
B52EE8AB121359A600CFBDAB /* formula_string_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = formula_string_utils.hpp; sourceTree = "<group>"; };
|
||||
B52EE8A6121359A600CFBDAB /* debugger_fwd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger_fwd.cpp; sourceTree = "<group>"; };
|
||||
B52EE8A7121359A600CFBDAB /* debugger_fwd.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = debugger_fwd.hpp; sourceTree = "<group>"; };
|
||||
B52EE8A8121359A600CFBDAB /* debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger.cpp; sourceTree = "<group>"; };
|
||||
B52EE8A9121359A600CFBDAB /* debugger.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = debugger.hpp; sourceTree = "<group>"; };
|
||||
B52EE8AA121359A600CFBDAB /* string_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_utils.cpp; sourceTree = "<group>"; };
|
||||
B52EE8AB121359A600CFBDAB /* string_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_utils.hpp; sourceTree = "<group>"; };
|
||||
B52EE8AC121359A600CFBDAB /* game_end_exceptions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = game_end_exceptions.hpp; sourceTree = "<group>"; };
|
||||
B52EE8AD121359A600CFBDAB /* hash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hash.cpp; sourceTree = "<group>"; };
|
||||
B52EE8AE121359A600CFBDAB /* hash.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = hash.hpp; sourceTree = "<group>"; };
|
||||
|
|
@ -1746,8 +1746,8 @@
|
|||
B55999650EC62181008DD061 /* video.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = video.cpp; path = ../src/video.cpp; sourceTree = "<group>"; };
|
||||
B55999660EC62181008DD061 /* version.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = version.hpp; path = ../src/version.hpp; sourceTree = "<group>"; };
|
||||
B55999670EC62181008DD061 /* version.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = version.cpp; path = ../src/version.cpp; sourceTree = "<group>"; };
|
||||
B55999680EC62181008DD061 /* variant.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = variant.hpp; path = ../src/variant.hpp; sourceTree = "<group>"; };
|
||||
B55999690EC62181008DD061 /* variant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = variant.cpp; path = ../src/variant.cpp; sourceTree = "<group>"; };
|
||||
B55999680EC62181008DD061 /* variant.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = variant.hpp; sourceTree = "<group>"; };
|
||||
B55999690EC62181008DD061 /* variant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = variant.cpp; sourceTree = "<group>"; };
|
||||
B559996A0EC62181008DD061 /* variable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = variable.hpp; path = ../src/variable.hpp; sourceTree = "<group>"; };
|
||||
B559996B0EC62181008DD061 /* variable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = variable.cpp; path = ../src/variable.cpp; sourceTree = "<group>"; };
|
||||
B559996C0EC62181008DD061 /* util.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = util.hpp; path = ../src/util.hpp; sourceTree = "<group>"; };
|
||||
|
|
@ -1883,15 +1883,15 @@
|
|||
B5599A7E0EC62181008DD061 /* game_display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = game_display.cpp; path = ../src/game_display.cpp; sourceTree = "<group>"; };
|
||||
B5599A7F0EC62181008DD061 /* game_config.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = game_config.hpp; path = ../src/game_config.hpp; sourceTree = "<group>"; };
|
||||
B5599A800EC62181008DD061 /* game_config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = game_config.cpp; path = ../src/game_config.cpp; sourceTree = "<group>"; };
|
||||
B5599A820EC62181008DD061 /* formula_tokenizer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = formula_tokenizer.hpp; path = ../src/formula_tokenizer.hpp; sourceTree = "<group>"; };
|
||||
B5599A830EC62181008DD061 /* formula_tokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = formula_tokenizer.cpp; path = ../src/formula_tokenizer.cpp; sourceTree = "<group>"; };
|
||||
B5599A840EC62181008DD061 /* formula_fwd.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = formula_fwd.hpp; path = ../src/formula_fwd.hpp; sourceTree = "<group>"; };
|
||||
B5599A850EC62181008DD061 /* formula_function.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = formula_function.hpp; path = ../src/formula_function.hpp; sourceTree = "<group>"; };
|
||||
B5599A860EC62181008DD061 /* formula_function.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = formula_function.cpp; path = ../src/formula_function.cpp; sourceTree = "<group>"; };
|
||||
B5599A870EC62181008DD061 /* formula_callable_fwd.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = formula_callable_fwd.hpp; path = ../src/formula_callable_fwd.hpp; sourceTree = "<group>"; };
|
||||
B5599A880EC62181008DD061 /* formula_callable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = formula_callable.hpp; path = ../src/formula_callable.hpp; sourceTree = "<group>"; };
|
||||
B5599A8B0EC62181008DD061 /* formula.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = formula.hpp; path = ../src/formula.hpp; sourceTree = "<group>"; };
|
||||
B5599A8C0EC62181008DD061 /* formula.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = formula.cpp; path = ../src/formula.cpp; sourceTree = "<group>"; };
|
||||
B5599A820EC62181008DD061 /* tokenizer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tokenizer.hpp; sourceTree = "<group>"; };
|
||||
B5599A830EC62181008DD061 /* tokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tokenizer.cpp; sourceTree = "<group>"; };
|
||||
B5599A840EC62181008DD061 /* formula_fwd.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = formula_fwd.hpp; sourceTree = "<group>"; };
|
||||
B5599A850EC62181008DD061 /* function.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = function.hpp; sourceTree = "<group>"; };
|
||||
B5599A860EC62181008DD061 /* function.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = function.cpp; sourceTree = "<group>"; };
|
||||
B5599A870EC62181008DD061 /* callable_fwd.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = callable_fwd.hpp; sourceTree = "<group>"; };
|
||||
B5599A880EC62181008DD061 /* callable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = callable.hpp; sourceTree = "<group>"; };
|
||||
B5599A8B0EC62181008DD061 /* formula.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = formula.hpp; sourceTree = "<group>"; };
|
||||
B5599A8C0EC62181008DD061 /* formula.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = formula.cpp; sourceTree = "<group>"; };
|
||||
B5599A8D0EC62181008DD061 /* formatter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = formatter.hpp; path = ../src/formatter.hpp; sourceTree = "<group>"; };
|
||||
B5599A8F0EC62181008DD061 /* font.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = font.hpp; path = ../src/font.hpp; sourceTree = "<group>"; };
|
||||
B5599A900EC62181008DD061 /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = font.cpp; path = ../src/font.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -1916,8 +1916,8 @@
|
|||
B5599AA80EC62181008DD061 /* config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = config.cpp; path = ../src/config.cpp; sourceTree = "<group>"; };
|
||||
B5599AA90EC62181008DD061 /* color_range.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = color_range.hpp; path = ../src/color_range.hpp; sourceTree = "<group>"; };
|
||||
B5599AAA0EC62181008DD061 /* color_range.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = color_range.cpp; path = ../src/color_range.cpp; sourceTree = "<group>"; };
|
||||
B5599AAF0EC62181008DD061 /* callable_objects.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = callable_objects.hpp; path = ../src/callable_objects.hpp; sourceTree = "<group>"; };
|
||||
B5599AB00EC62181008DD061 /* callable_objects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = callable_objects.cpp; path = ../src/callable_objects.cpp; sourceTree = "<group>"; };
|
||||
B5599AAF0EC62181008DD061 /* callable_objects.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = callable_objects.hpp; sourceTree = "<group>"; };
|
||||
B5599AB00EC62181008DD061 /* callable_objects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = callable_objects.cpp; sourceTree = "<group>"; };
|
||||
B5599AB20EC62181008DD061 /* filechooser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = filechooser.hpp; path = ../src/filechooser.hpp; sourceTree = "<group>"; };
|
||||
B5599AB40EC62181008DD061 /* array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = array.hpp; path = ../src/array.hpp; sourceTree = "<group>"; };
|
||||
B5599AB50EC62181008DD061 /* animated_game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animated_game.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -2440,10 +2440,10 @@
|
|||
ECA4A6781A1EC319006BCCF2 /* lua_fileops.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_fileops.cpp; sourceTree = "<group>"; };
|
||||
ECA4A6791A1EC319006BCCF2 /* lua_map_location_ops.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_map_location_ops.cpp; sourceTree = "<group>"; };
|
||||
ECA4A67A1A1EC319006BCCF2 /* lua_rng.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_rng.cpp; sourceTree = "<group>"; };
|
||||
ECA563831A47BA36006278A5 /* hotkey_handler_mp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotkey_handler_mp.cpp; sourceTree = "<group>"; };
|
||||
ECA563841A47BA36006278A5 /* hotkey_handler_replay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotkey_handler_replay.cpp; sourceTree = "<group>"; };
|
||||
ECA563851A47BA36006278A5 /* hotkey_handler_sp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotkey_handler_sp.cpp; sourceTree = "<group>"; };
|
||||
ECA563861A47BA36006278A5 /* hotkey_handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotkey_handler.cpp; sourceTree = "<group>"; };
|
||||
ECA563831A47BA36006278A5 /* hotkey_handler_mp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hotkey_handler_mp.cpp; path = /Users/seanachi/Documents/Programming/wesnoth/src/hotkey/hotkey_handler_mp.cpp; sourceTree = "<absolute>"; };
|
||||
ECA563841A47BA36006278A5 /* hotkey_handler_replay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hotkey_handler_replay.cpp; path = /Users/seanachi/Documents/Programming/wesnoth/src/hotkey/hotkey_handler_replay.cpp; sourceTree = "<absolute>"; };
|
||||
ECA563851A47BA36006278A5 /* hotkey_handler_sp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hotkey_handler_sp.cpp; path = /Users/seanachi/Documents/Programming/wesnoth/src/hotkey/hotkey_handler_sp.cpp; sourceTree = "<absolute>"; };
|
||||
ECA563861A47BA36006278A5 /* hotkey_handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hotkey_handler.cpp; path = /Users/seanachi/Documents/Programming/wesnoth/src/hotkey/hotkey_handler.cpp; sourceTree = "<absolute>"; };
|
||||
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>"; };
|
||||
ECAB844E1B0C1933001A3EB7 /* shroud_clearing_action.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shroud_clearing_action.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -2739,8 +2739,6 @@
|
|||
91B621801B766ED500B00E0F /* buffered_istream.hpp */,
|
||||
91B621A11B76A3CC00B00E0F /* build_info.cpp */,
|
||||
91B621A31B76A5FA00B00E0F /* build_info.hpp */,
|
||||
B5599AB00EC62181008DD061 /* callable_objects.cpp */,
|
||||
B5599AAF0EC62181008DD061 /* callable_objects.hpp */,
|
||||
ECFB9FA7193BFAD900146ED0 /* carryover.cpp */,
|
||||
91B621811B766F1900B00E0F /* carryover.hpp */,
|
||||
B5951A811013BB0800C10B66 /* chat_events.hpp */,
|
||||
|
|
@ -2794,21 +2792,7 @@
|
|||
ECC8F419185FE2E1004AC3BE /* format_time_summary.cpp */,
|
||||
ECC8F41A185FE2E1004AC3BE /* format_time_summary.hpp */,
|
||||
B5599A8D0EC62181008DD061 /* formatter.hpp */,
|
||||
B5599A8C0EC62181008DD061 /* formula.cpp */,
|
||||
B5599A8B0EC62181008DD061 /* formula.hpp */,
|
||||
B5599A880EC62181008DD061 /* formula_callable.hpp */,
|
||||
B5599A870EC62181008DD061 /* formula_callable_fwd.hpp */,
|
||||
B52EE8A8121359A600CFBDAB /* formula_debugger.cpp */,
|
||||
B52EE8A9121359A600CFBDAB /* formula_debugger.hpp */,
|
||||
B52EE8A6121359A600CFBDAB /* formula_debugger_fwd.cpp */,
|
||||
B52EE8A7121359A600CFBDAB /* formula_debugger_fwd.hpp */,
|
||||
B5599A860EC62181008DD061 /* formula_function.cpp */,
|
||||
B5599A850EC62181008DD061 /* formula_function.hpp */,
|
||||
B5599A840EC62181008DD061 /* formula_fwd.hpp */,
|
||||
B52EE8AA121359A600CFBDAB /* formula_string_utils.cpp */,
|
||||
B52EE8AB121359A600CFBDAB /* formula_string_utils.hpp */,
|
||||
B5599A830EC62181008DD061 /* formula_tokenizer.cpp */,
|
||||
B5599A820EC62181008DD061 /* formula_tokenizer.hpp */,
|
||||
91EF6C081C9EF6B300E2A733 /* formula */,
|
||||
ECFB9FA9193BFB4B00146ED0 /* game_board.cpp */,
|
||||
91B621851B76706E00B00E0F /* game_board.hpp */,
|
||||
ECDEAF78194FEA9D00DB2F47 /* game_classification.cpp */,
|
||||
|
|
@ -2845,14 +2829,6 @@
|
|||
B52EE8AE121359A600CFBDAB /* hash.hpp */,
|
||||
91B6218E1B76710700B00E0F /* help */,
|
||||
91B621A01B76754E00B00E0F /* hotkey */,
|
||||
ECA563861A47BA36006278A5 /* hotkey_handler.cpp */,
|
||||
91B6218F1B76717400B00E0F /* hotkey_handler.hpp */,
|
||||
ECA563831A47BA36006278A5 /* hotkey_handler_mp.cpp */,
|
||||
91B621921B76718700B00E0F /* hotkey_handler_mp.hpp */,
|
||||
ECA563841A47BA36006278A5 /* hotkey_handler_replay.cpp */,
|
||||
91B621911B76718000B00E0F /* hotkey_handler_replay.hpp */,
|
||||
ECA563851A47BA36006278A5 /* hotkey_handler_sp.cpp */,
|
||||
91B621901B76717B00B00E0F /* hotkey_handler_sp.hpp */,
|
||||
B5599A0F0EC62181008DD061 /* image.cpp */,
|
||||
B5599A0E0EC62181008DD061 /* image.hpp */,
|
||||
F4E4E0B21367244F001C7528 /* image_modifications.cpp */,
|
||||
|
|
@ -2878,8 +2854,6 @@
|
|||
B5A5E3AD12132C790047782D /* lua */,
|
||||
F419E44413354E620031448A /* lua_jailbreak_exception.cpp */,
|
||||
F419E44313354E620031448A /* lua_jailbreak_exception.hpp */,
|
||||
EC53B04D1B23BB0E002F758F /* make_enum.cpp */,
|
||||
91B621931B76720B00B00E0F /* make_enum.hpp */,
|
||||
B5599A000EC62181008DD061 /* map.cpp */,
|
||||
B55999FF0EC62181008DD061 /* map.hpp */,
|
||||
B55999FC0EC62181008DD061 /* map_exception.hpp */,
|
||||
|
|
@ -3082,8 +3056,6 @@
|
|||
EC2864311967990500168DFF /* variable_info.cpp */,
|
||||
EC2864321967990500168DFF /* variable_info.hpp */,
|
||||
91B6219D1B76737200B00E0F /* variable_info_detail.hpp */,
|
||||
B55999690EC62181008DD061 /* variant.cpp */,
|
||||
B55999680EC62181008DD061 /* variant.hpp */,
|
||||
B55999670EC62181008DD061 /* version.cpp */,
|
||||
B55999660EC62181008DD061 /* version.hpp */,
|
||||
B55999650EC62181008DD061 /* video.cpp */,
|
||||
|
|
@ -3421,6 +3393,14 @@
|
|||
ECFA82DB184E59F3006782FB /* command_executor.hpp */,
|
||||
ECFA82DC184E59F3006782FB /* hotkey_command.cpp */,
|
||||
ECFA82DD184E59F3006782FB /* hotkey_command.hpp */,
|
||||
ECA563861A47BA36006278A5 /* hotkey_handler.cpp */,
|
||||
91B6218F1B76717400B00E0F /* hotkey_handler.hpp */,
|
||||
ECA563831A47BA36006278A5 /* hotkey_handler_mp.cpp */,
|
||||
91B621921B76718700B00E0F /* hotkey_handler_mp.hpp */,
|
||||
ECA563841A47BA36006278A5 /* hotkey_handler_replay.cpp */,
|
||||
91B621911B76718000B00E0F /* hotkey_handler_replay.hpp */,
|
||||
ECA563851A47BA36006278A5 /* hotkey_handler_sp.cpp */,
|
||||
91B621901B76717B00B00E0F /* hotkey_handler_sp.hpp */,
|
||||
ECFA82DE184E59F3006782FB /* hotkey_item.cpp */,
|
||||
ECFA82DF184E59F3006782FB /* hotkey_item.hpp */,
|
||||
ECFA82E0184E59F3006782FB /* hotkey_manager.cpp */,
|
||||
|
|
@ -3522,6 +3502,8 @@
|
|||
91EF6BFC1C9E22E400E2A733 /* const_clone.hpp */,
|
||||
91EF6BFE1C9E22E400E2A733 /* foreach.hpp */,
|
||||
91EF6BFF1C9E22E400E2A733 /* iterator.hpp */,
|
||||
EC53B04D1B23BB0E002F758F /* make_enum.cpp */,
|
||||
91B621931B76720B00B00E0F /* make_enum.hpp */,
|
||||
91EF6C001C9E22E400E2A733 /* reference_counter.hpp */,
|
||||
91EF6C011C9E22E400E2A733 /* sha1.cpp */,
|
||||
91EF6C021C9E22E400E2A733 /* sha1.hpp */,
|
||||
|
|
@ -3531,6 +3513,32 @@
|
|||
path = utils;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
91EF6C081C9EF6B300E2A733 /* formula */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B5599A880EC62181008DD061 /* callable.hpp */,
|
||||
B5599A870EC62181008DD061 /* callable_fwd.hpp */,
|
||||
B5599AB00EC62181008DD061 /* callable_objects.cpp */,
|
||||
B5599AAF0EC62181008DD061 /* callable_objects.hpp */,
|
||||
B52EE8A8121359A600CFBDAB /* debugger.cpp */,
|
||||
B52EE8A9121359A600CFBDAB /* debugger.hpp */,
|
||||
B52EE8A6121359A600CFBDAB /* debugger_fwd.cpp */,
|
||||
B52EE8A7121359A600CFBDAB /* debugger_fwd.hpp */,
|
||||
B5599A8C0EC62181008DD061 /* formula.cpp */,
|
||||
B5599A8B0EC62181008DD061 /* formula.hpp */,
|
||||
B5599A840EC62181008DD061 /* formula_fwd.hpp */,
|
||||
B5599A860EC62181008DD061 /* function.cpp */,
|
||||
B5599A850EC62181008DD061 /* function.hpp */,
|
||||
B52EE8AA121359A600CFBDAB /* string_utils.cpp */,
|
||||
B52EE8AB121359A600CFBDAB /* string_utils.hpp */,
|
||||
B5599A830EC62181008DD061 /* tokenizer.cpp */,
|
||||
B5599A820EC62181008DD061 /* tokenizer.hpp */,
|
||||
B55999690EC62181008DD061 /* variant.cpp */,
|
||||
B55999680EC62181008DD061 /* variant.hpp */,
|
||||
);
|
||||
path = formula;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B52EE8FD12135AC300CFBDAB /* whiteboard */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -4801,12 +4809,12 @@
|
|||
F444917713C5562C003B6442 /* folder_create.cpp in Sources */,
|
||||
B5599B710EC62181008DD061 /* font.cpp in Sources */,
|
||||
ECC8F41B185FE2E1004AC3BE /* format_time_summary.cpp in Sources */,
|
||||
B52EE8CD121359A600CFBDAB /* formula_debugger_fwd.cpp in Sources */,
|
||||
B52EE8CD121359A600CFBDAB /* debugger_fwd.cpp in Sources */,
|
||||
B561F370104B11B6001369F5 /* formula_debugger.cpp in Sources */,
|
||||
B52EE8CE121359A600CFBDAB /* formula_debugger.cpp in Sources */,
|
||||
B5599B6E0EC62181008DD061 /* formula_function.cpp in Sources */,
|
||||
B52EE8CF121359A600CFBDAB /* formula_string_utils.cpp in Sources */,
|
||||
B5599B6D0EC62181008DD061 /* formula_tokenizer.cpp in Sources */,
|
||||
B52EE8CE121359A600CFBDAB /* debugger.cpp in Sources */,
|
||||
B5599B6E0EC62181008DD061 /* function.cpp in Sources */,
|
||||
B52EE8CF121359A600CFBDAB /* string_utils.cpp in Sources */,
|
||||
B5599B6D0EC62181008DD061 /* tokenizer.cpp in Sources */,
|
||||
B5599B700EC62181008DD061 /* formula.cpp in Sources */,
|
||||
B5951A9C1013BB5A00C10B66 /* function_table.cpp in Sources */,
|
||||
ECFB9FAA193BFB4B00146ED0 /* game_board.cpp in Sources */,
|
||||
|
|
@ -5335,12 +5343,12 @@
|
|||
B597C5DA0FACD6CA00CE81F5 /* filechooser.cpp in Sources */,
|
||||
B597C54D0FACD6CA00CE81F5 /* floating_textbox.cpp in Sources */,
|
||||
B597C5750FACD6CA00CE81F5 /* font.cpp in Sources */,
|
||||
B52EE8E1121359A600CFBDAB /* formula_debugger_fwd.cpp in Sources */,
|
||||
B52EE8E1121359A600CFBDAB /* debugger_fwd.cpp in Sources */,
|
||||
B561F371104B11B6001369F5 /* formula_debugger.cpp in Sources */,
|
||||
B52EE8E2121359A600CFBDAB /* formula_debugger.cpp in Sources */,
|
||||
B597C5B10FACD6CA00CE81F5 /* formula_function.cpp in Sources */,
|
||||
B52EE8E3121359A600CFBDAB /* formula_string_utils.cpp in Sources */,
|
||||
B597C5370FACD6CA00CE81F5 /* formula_tokenizer.cpp in Sources */,
|
||||
B52EE8E2121359A600CFBDAB /* debugger.cpp in Sources */,
|
||||
B597C5B10FACD6CA00CE81F5 /* function.cpp in Sources */,
|
||||
B52EE8E3121359A600CFBDAB /* string_utils.cpp in Sources */,
|
||||
B597C5370FACD6CA00CE81F5 /* tokenizer.cpp in Sources */,
|
||||
B597C5EA0FACD6CA00CE81F5 /* formula.cpp in Sources */,
|
||||
B5951A9E1013BB5A00C10B66 /* function_table.cpp in Sources */,
|
||||
B597C4D20FACD43B00CE81F5 /* game_config_manager.cpp in Sources */,
|
||||
|
|
|
|||
|
|
@ -785,7 +785,6 @@ set(wesnoth-main_SRC
|
|||
attack_prediction.cpp
|
||||
attack_prediction_display.cpp
|
||||
build_info.cpp
|
||||
callable_objects.cpp
|
||||
carryover.cpp
|
||||
commandline_options.cpp
|
||||
config_cache.cpp
|
||||
|
|
@ -833,12 +832,14 @@ set(wesnoth-main_SRC
|
|||
filechooser.cpp
|
||||
game_initialization/flg_manager.cpp
|
||||
floating_textbox.cpp
|
||||
formula.cpp
|
||||
formula_debugger.cpp
|
||||
formula_debugger_fwd.cpp
|
||||
formula_function.cpp
|
||||
formula_string_utils.cpp
|
||||
formula_tokenizer.cpp
|
||||
formula/callable_objects.cpp
|
||||
formula/formula.cpp
|
||||
formula/debugger.cpp
|
||||
formula/debugger_fwd.cpp
|
||||
formula/function.cpp
|
||||
formula/string_utils.cpp
|
||||
formula/tokenizer.cpp
|
||||
formula/variant.cpp
|
||||
game_board.cpp
|
||||
game_classification.cpp
|
||||
game_config_manager.cpp
|
||||
|
|
@ -939,10 +940,10 @@ set(wesnoth-main_SRC
|
|||
help/help_text_area.cpp
|
||||
help/help_topic_generators.cpp
|
||||
hotkey/hotkey_preferences_display.cpp
|
||||
hotkey_handler.cpp
|
||||
hotkey_handler_sp.cpp
|
||||
hotkey_handler_mp.cpp
|
||||
hotkey_handler_replay.cpp
|
||||
hotkey/hotkey_handler.cpp
|
||||
hotkey/hotkey_handler_sp.cpp
|
||||
hotkey/hotkey_handler_mp.cpp
|
||||
hotkey/hotkey_handler_replay.cpp
|
||||
intro.cpp
|
||||
leader_scroll_dialog.cpp
|
||||
map.cpp
|
||||
|
|
@ -1044,7 +1045,6 @@ set(wesnoth-main_SRC
|
|||
utils/sha1.cpp
|
||||
variable.cpp
|
||||
variable_info.cpp
|
||||
variant.cpp
|
||||
whiteboard/action.cpp
|
||||
whiteboard/attack.cpp
|
||||
whiteboard/highlighter.cpp
|
||||
|
|
|
|||
|
|
@ -257,7 +257,6 @@ wesnoth_sources = Split("""
|
|||
attack_prediction.cpp
|
||||
attack_prediction_display.cpp
|
||||
build_info.cpp
|
||||
callable_objects.cpp
|
||||
commandline_options.cpp
|
||||
carryover.cpp
|
||||
config_cache.cpp
|
||||
|
|
@ -305,12 +304,14 @@ wesnoth_sources = Split("""
|
|||
filechooser.cpp
|
||||
game_initialization/flg_manager.cpp
|
||||
floating_textbox.cpp
|
||||
formula.cpp
|
||||
formula_debugger.cpp
|
||||
formula_debugger_fwd.cpp
|
||||
formula_function.cpp
|
||||
formula_string_utils.cpp
|
||||
formula_tokenizer.cpp
|
||||
formula/callable_objects.cpp
|
||||
formula/formula.cpp
|
||||
formula/debugger.cpp
|
||||
formula/debugger_fwd.cpp
|
||||
formula/function.cpp
|
||||
formula/string_utils.cpp
|
||||
formula/tokenizer.cpp
|
||||
formula/variant.cpp
|
||||
game_board.cpp
|
||||
game_classification.cpp
|
||||
game_config_manager.cpp
|
||||
|
|
@ -520,10 +521,10 @@ wesnoth_sources = Split("""
|
|||
help/help_text_area.cpp
|
||||
help/help_topic_generators.cpp
|
||||
hotkey/hotkey_preferences_display.cpp
|
||||
hotkey_handler.cpp
|
||||
hotkey_handler_sp.cpp
|
||||
hotkey_handler_mp.cpp
|
||||
hotkey_handler_replay.cpp
|
||||
hotkey/hotkey_handler.cpp
|
||||
hotkey/hotkey_handler_sp.cpp
|
||||
hotkey/hotkey_handler_mp.cpp
|
||||
hotkey/hotkey_handler_replay.cpp
|
||||
intro.cpp
|
||||
leader_scroll_dialog.cpp
|
||||
lobby_preferences.cpp
|
||||
|
|
@ -622,7 +623,6 @@ wesnoth_sources = Split("""
|
|||
utils/sha1.cpp
|
||||
variable.cpp
|
||||
variable_info.cpp
|
||||
variant.cpp
|
||||
whiteboard/action.cpp
|
||||
whiteboard/attack.cpp
|
||||
whiteboard/highlighter.cpp
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
#include "play_controller.hpp"
|
||||
#include "resources.hpp"
|
||||
#include "unit_display.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "team.hpp"
|
||||
#include "unit.hpp"
|
||||
#include "unit_animation_component.hpp"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include "addon/manager.hpp"
|
||||
#include "addon/validation.hpp"
|
||||
#include "cursor.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "gui/dialogs/message.hpp"
|
||||
#include "log.hpp"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#include "serialization/parser.hpp"
|
||||
#include "version.hpp"
|
||||
#include "wml_separators.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "addon/client.hpp"
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include "dialogs.hpp"
|
||||
#include "filesystem.hpp"
|
||||
#include "formatter.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "gui/dialogs/addon_list.hpp"
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
#include "unit_map.hpp" // for unit_map::iterator_base, etc
|
||||
#include "unit_ptr.hpp" // for unit_ptr
|
||||
#include "unit_types.hpp" // for attack_type, unit_type, etc
|
||||
#include "variant.hpp" // for variant
|
||||
#include "formula/variant.hpp" // for variant
|
||||
|
||||
#include <algorithm> // for find, count, max, fill_n
|
||||
#include <boost/foreach.hpp> // for auto_any_base, etc
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#define AI_DEFAULT_CONTEXTS_HPP_INCLUDED
|
||||
|
||||
#include "ai/contexts.hpp"
|
||||
#include "formula_callable.hpp"
|
||||
#include "formula/callable.hpp"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER < 1600
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include "callable_objects.hpp" // for unit_callable, etc
|
||||
#include "chat_events.hpp" // for chat_handler, etc
|
||||
#include "display_chat_manager.hpp"
|
||||
#include "formula_function.hpp" // for formula_expression
|
||||
#include "formula/function.hpp" // for formula_expression
|
||||
#include "game_board.hpp" // for game_board
|
||||
#include "game_display.hpp" // for game_display
|
||||
#include "log.hpp" // for LOG_STREAM, logger, etc
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
#include "unit_formula_manager.hpp" // for unit_formula_manager
|
||||
#include "unit_ptr.hpp" // for unit_ptr
|
||||
#include "unit_types.hpp"
|
||||
#include "formula.hpp" // for formula_error, formula, etc
|
||||
#include "formula/formula.hpp" // for formula_error, formula, etc
|
||||
#include "map_location.hpp" // for map_location, etc
|
||||
#include "ai/actions.hpp" // for recall_result, etc
|
||||
#include "ai/manager.hpp" // for manager
|
||||
|
|
@ -53,7 +53,6 @@
|
|||
#include "ai/formula/function_table.hpp" // for ai_function_symbol_table
|
||||
#include "ai/game_info.hpp" // for move_result_ptr, move_map, etc
|
||||
#include "ai/interface.hpp" // for interface
|
||||
#include "callable_objects.hpp" // for safe_call_result, etc
|
||||
#include "candidates.hpp" // for base_candidate_action, etc
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
#include "callable_objects.hpp" // for position_callable, etc
|
||||
#include "candidates.hpp" // for candidate_action_ptr, etc
|
||||
#include "config.hpp" // for config
|
||||
#include "formula_callable.hpp" // for formula_callable, etc
|
||||
#include "formula_fwd.hpp" // for const_formula_ptr, etc
|
||||
#include "formula/callable.hpp" // for formula_callable, etc
|
||||
#include "formula/formula_fwd.hpp" // for const_formula_ptr, etc
|
||||
#include "generic_event.hpp" // for observer
|
||||
#include "pathfind/teleport.hpp" // for teleport_map
|
||||
#include "unit_map.hpp"
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
|
||||
#include "ai/game_info.hpp"
|
||||
#include "actions/attack.hpp"
|
||||
#include "../../callable_objects.hpp" // We want the file in src/
|
||||
#include "formula.hpp"
|
||||
#include "formula_callable.hpp"
|
||||
#include "formula/callable_objects.hpp"
|
||||
#include "formula/formula.hpp"
|
||||
#include "formula/callable.hpp"
|
||||
|
||||
namespace ai {
|
||||
class formula_ai;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#ifndef AI_FORMULA_CANDIDATES_HPP_INCLUDED
|
||||
#define AI_FORMULA_CANDIDATES_HPP_INCLUDED
|
||||
|
||||
#include "formula_function.hpp"
|
||||
#include "formula/function.hpp"
|
||||
|
||||
#include <set>
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#ifndef FORMULA_AI_FUNCTION_TABLE_HPP_INCLUDED
|
||||
#define FORMULA_AI_FUNCTION_TABLE_HPP_INCLUDED
|
||||
|
||||
#include "formula_function.hpp"
|
||||
#include "formula/function.hpp"
|
||||
|
||||
#include <set>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
#include "stage_side_formulas.hpp"
|
||||
#include "ai.hpp"
|
||||
|
||||
#include "formula.hpp"
|
||||
#include "formula_function.hpp"
|
||||
#include "formula/formula.hpp"
|
||||
#include "formula/function.hpp"
|
||||
#include "log.hpp"
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#define AI_FORMULA_STAGE_SIDE_FORMULAS_HPP_INCLUDED
|
||||
|
||||
#include "ai/composite/stage.hpp"
|
||||
#include "formula_fwd.hpp"
|
||||
#include "formula/formula_fwd.hpp"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
#include "stage_unit_formulas.hpp"
|
||||
#include "ai.hpp"
|
||||
|
||||
#include "formula.hpp"
|
||||
#include "formula_function.hpp"
|
||||
#include "formula/formula.hpp"
|
||||
#include "formula/function.hpp"
|
||||
#include "log.hpp"
|
||||
#include "resources.hpp"
|
||||
#include "unit.hpp"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include "construct_dialog.hpp"
|
||||
|
||||
#include "config_assign.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_config.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "sound.hpp"
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
#include "wml_separators.hpp"
|
||||
#include "widgets/progressbar.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gui/dialogs/game_save.hpp"
|
||||
#include "gui/dialogs/transient_message.hpp"
|
||||
#include "ai/lua/unit_advancements_aspect.hpp"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include "display.hpp"
|
||||
#include "filesystem.hpp"
|
||||
#include "filechooser.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "generators/map_create.hpp"
|
||||
#include "generators/map_generator.hpp"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "editor/action/action_base.hpp"
|
||||
#include "editor_map.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#include "display.hpp"
|
||||
#include "gettext.hpp"
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include "wml_exception.hpp"
|
||||
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost/foreach.hpp>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include "terrain_palettes.hpp"
|
||||
|
||||
#include "gettext.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#define FORMULA_CALLABLE_HPP_INCLUDED
|
||||
|
||||
#include "reference_counted_object.hpp"
|
||||
#include "variant.hpp"
|
||||
#include "formula/variant.hpp"
|
||||
|
||||
namespace game_logic
|
||||
{
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
See the COPYING file for more details.
|
||||
*/
|
||||
|
||||
#include "callable_objects.hpp"
|
||||
#include "formula/callable_objects.hpp"
|
||||
#include "unit.hpp"
|
||||
#include "unit_formula_manager.hpp"
|
||||
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
#ifndef CALLABLE_OBJECTS_HPP_INCLUDED
|
||||
#define CALLABLE_OBJECTS_HPP_INCLUDED
|
||||
|
||||
#include "formula_callable.hpp"
|
||||
#include "formula/callable.hpp"
|
||||
#include "map.hpp"
|
||||
#include "team.hpp"
|
||||
#include "unit.hpp"
|
||||
|
|
@ -18,9 +18,9 @@
|
|||
* */
|
||||
|
||||
|
||||
#include "formula_debugger.hpp"
|
||||
#include "formula.hpp"
|
||||
#include "formula_function.hpp"
|
||||
#include "formula/debugger.hpp"
|
||||
#include "formula/formula.hpp"
|
||||
#include "formula/function.hpp"
|
||||
#include "game_display.hpp"
|
||||
#include "log.hpp"
|
||||
#include "resources.hpp"
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
|
||||
#include "global.hpp"
|
||||
|
||||
#include "variant.hpp"
|
||||
#include "formula_debugger_fwd.hpp"
|
||||
#include "formula/variant.hpp"
|
||||
#include "formula/debugger_fwd.hpp"
|
||||
#include <deque>
|
||||
|
||||
namespace game_logic {
|
||||
|
|
@ -18,8 +18,8 @@
|
|||
* */
|
||||
|
||||
|
||||
#include "formula_debugger_fwd.hpp"
|
||||
#include "formula_debugger.hpp"
|
||||
#include "formula/debugger_fwd.hpp"
|
||||
#include "formula/debugger.hpp"
|
||||
|
||||
namespace game_logic {
|
||||
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
#include <set>
|
||||
#include <sstream>
|
||||
|
||||
#include "formula_callable.hpp"
|
||||
#include "formula_function.hpp"
|
||||
#include "formula/callable.hpp"
|
||||
#include "formula/function.hpp"
|
||||
#include "map_utils.hpp"
|
||||
#include "random_new.hpp"
|
||||
#include "serialization/string_utils.hpp"
|
||||
|
|
@ -13,10 +13,10 @@
|
|||
#ifndef FORMULA_HPP_INCLUDED
|
||||
#define FORMULA_HPP_INCLUDED
|
||||
|
||||
#include "formula_debugger_fwd.hpp"
|
||||
#include "formula_fwd.hpp"
|
||||
#include "formula_tokenizer.hpp"
|
||||
#include "variant.hpp"
|
||||
#include "formula/debugger_fwd.hpp"
|
||||
#include "formula/formula_fwd.hpp"
|
||||
#include "formula/tokenizer.hpp"
|
||||
#include "formula/variant.hpp"
|
||||
|
||||
namespace game_logic
|
||||
{
|
||||
|
|
@ -15,9 +15,9 @@
|
|||
#include "global.hpp"
|
||||
|
||||
|
||||
#include "callable_objects.hpp"
|
||||
#include "formula_debugger.hpp"
|
||||
#include "formula_function.hpp"
|
||||
#include "formula/callable_objects.hpp"
|
||||
#include "formula/debugger.hpp"
|
||||
#include "formula/function.hpp"
|
||||
#include "game_display.hpp"
|
||||
#include "game_config.hpp"
|
||||
#include "log.hpp"
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
#ifndef FORMULA_FUNCTION_HPP_INCLUDED
|
||||
#define FORMULA_FUNCTION_HPP_INCLUDED
|
||||
|
||||
#include "formula.hpp"
|
||||
#include "formula_callable.hpp"
|
||||
#include "formula/formula.hpp"
|
||||
#include "formula/callable.hpp"
|
||||
|
||||
namespace game_logic {
|
||||
|
||||
|
|
@ -13,11 +13,11 @@
|
|||
See the COPYING file for more details.
|
||||
*/
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#include "config.hpp"
|
||||
#include "log.hpp"
|
||||
#include "formula.hpp"
|
||||
#include "formula/formula.hpp"
|
||||
#include "gettext.hpp"
|
||||
|
||||
static lg::log_domain log_engine("engine");
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include <sstream>
|
||||
|
||||
#include "formula_tokenizer.hpp"
|
||||
#include "formula/tokenizer.hpp"
|
||||
|
||||
namespace formula_tokenizer
|
||||
{
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
#include "formatter.hpp"
|
||||
#include "formula_callable.hpp"
|
||||
#include "formula_function.hpp"
|
||||
#include "formula/callable.hpp"
|
||||
#include "formula/function.hpp"
|
||||
#include "util.hpp"
|
||||
|
||||
namespace {
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
#ifndef GAME_CLASSIFICATION_HPP_INCLUDED
|
||||
#define GAME_CLASSIFICATION_HPP_INCLUDED
|
||||
|
||||
#include "make_enum.hpp"
|
||||
#include "utils/make_enum.hpp"
|
||||
#include "savegame_config.hpp"
|
||||
#include <vector>
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include "lua_jailbreak_exception.hpp"
|
||||
|
||||
#include "make_enum.hpp"
|
||||
#include "utils/make_enum.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <exception>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#include "menu_item.hpp"
|
||||
#include "pump.hpp"
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_data.hpp"
|
||||
#include "log.hpp"
|
||||
#include "reports.hpp"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include "pump.hpp"
|
||||
|
||||
#include "filter_context.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_data.hpp"
|
||||
#include "log.hpp"
|
||||
#include "reports.hpp"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include "game_events/menu_item.hpp"
|
||||
#include "game_events/pump.hpp"
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_data.hpp"
|
||||
#include "log.hpp"
|
||||
#include "reports.hpp"
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include "log.hpp"
|
||||
#include "mouse_handler_base.hpp"
|
||||
#include "hotkey/hotkey_command.hpp"
|
||||
#include "hotkey_handler.hpp"
|
||||
#include "hotkey/hotkey_handler.hpp"
|
||||
#include "play_controller.hpp"
|
||||
#include "preferences.hpp"
|
||||
#include "replay.hpp"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#include "configure_engine.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_config_manager.hpp"
|
||||
#include "mp_game_settings.hpp"
|
||||
#include "settings.hpp"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "ai/configuration.hpp"
|
||||
#include "config_assign.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "log.hpp"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include "generators/map_generator.hpp"
|
||||
#include "gui/dialogs/campaign_difficulty.hpp"
|
||||
#include "filesystem.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "hash.hpp"
|
||||
#include "log.hpp"
|
||||
#include "generators/map_create.hpp"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#define MULTIPLAYER_CREATE_ENGINE_HPP_INCLUDED
|
||||
|
||||
#include "config.hpp"
|
||||
#include "make_enum.hpp"
|
||||
#include "utils/make_enum.hpp"
|
||||
#include "map.hpp"
|
||||
#include "mp_game_settings.hpp"
|
||||
#include "sdl/utils.hpp"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include <algorithm>
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "log.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <vector>
|
||||
#include "config.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "make_enum.hpp"
|
||||
#include "utils/make_enum.hpp"
|
||||
|
||||
class CVideo;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include "flg_manager.hpp"
|
||||
|
||||
#include "config.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "mt_rng.hpp"
|
||||
#include "unit_types.hpp"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include "carryover.hpp"
|
||||
#include "config.hpp"
|
||||
#include "dialogs.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "saved_game.hpp"
|
||||
#include "game_config.hpp"
|
||||
#include "game_config_manager.hpp"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "addon/manager.hpp" // for get_installed_addons
|
||||
#include "dialogs.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "generators/map_create.hpp"
|
||||
#include "generators/map_generator.hpp"
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#include "scripting/plugins/context.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
#include "wml_separators.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#include <boost/assign/list_of.hpp>
|
||||
#include <boost/bind.hpp>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
#include "log.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
#include "wml_separators.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "widgets/multimenu.hpp"
|
||||
#include "sdl/utils.hpp"
|
||||
#include "sdl/rect.hpp"
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#include "log.hpp"
|
||||
#include "sound.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "terrain_type_data.hpp"
|
||||
#include "version.hpp"
|
||||
#include "sdl/rect.hpp"
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#include "multiplayer_lobby.hpp" //needed for dynamic cast when implementing the lobby_sounds preference
|
||||
#include "mp_ui_alerts.hpp"
|
||||
#include "wml_separators.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "scripting/plugins/context.hpp"
|
||||
#include "scripting/plugins/manager.hpp"
|
||||
#include "team.hpp"
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include "unit_types.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
#include "wml_separators.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "video.hpp"
|
||||
|
||||
#include <boost/bind.hpp>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
#include "sound.hpp"
|
||||
#include "terrain_type_data.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#include "race.hpp"
|
||||
#include "util.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include <SDL.h>
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#ifndef GUI_AUXILIARY_CANVAS_HPP_INCLUDED
|
||||
#define GUI_AUXILIARY_CANVAS_HPP_INCLUDED
|
||||
|
||||
#include "formula_callable.hpp"
|
||||
#include "formula/callable.hpp"
|
||||
#include "sdl/utils.hpp"
|
||||
|
||||
class config;
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
#ifndef GUI_WIDGETS_FORMULA_HPP_INCLUDED
|
||||
#define GUI_WIDGETS_FORMULA_HPP_INCLUDED
|
||||
|
||||
#include "formula_callable.hpp"
|
||||
#include "formula_function.hpp"
|
||||
#include "formula.hpp"
|
||||
#include "formula/callable.hpp"
|
||||
#include "formula/function.hpp"
|
||||
#include "formula/formula.hpp"
|
||||
#include "gui/auxiliary/log.hpp"
|
||||
#include "gui/widgets/helper.hpp"
|
||||
#include "serialization/string_utils.hpp"
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#define GUI_AUXILIARY_PLACER_HPP_INCLUDED
|
||||
|
||||
#include "global.hpp"
|
||||
#include "make_enum.hpp"
|
||||
#include "utils/make_enum.hpp"
|
||||
|
||||
namespace gui2
|
||||
{
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
#include "gui/auxiliary/window_builder/instance.hpp"
|
||||
#include "gui/widgets/settings.hpp"
|
||||
#include "gui/widgets/window.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "utils/foreach.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "desktop/clipboard.hpp"
|
||||
#include "desktop/open.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "gui/auxiliary/find_widget.hpp"
|
||||
#include "gui/widgets/button.hpp"
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
#include "gui/widgets/window.hpp"
|
||||
#include "utils/foreach.hpp"
|
||||
#include "serialization/string_utils.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "marked-up_text.hpp"
|
||||
#include "font.hpp"
|
||||
#include "preferences.hpp"
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include "image.hpp"
|
||||
#include "preferences.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/foreach.hpp>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#include "gui/dialogs/dialog.hpp"
|
||||
#include "gui/widgets/group.hpp"
|
||||
#include "make_enum.hpp"
|
||||
#include "utils/make_enum.hpp"
|
||||
|
||||
namespace gui2
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "config.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#include "gui/dialogs/campaign_difficulty.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "gui/dialogs/data_manage.hpp"
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_config.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "gettext.hpp"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "gui/widgets/settings.hpp"
|
||||
#include "gui/widgets/window.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
|
||||
namespace gui2
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include <boost/foreach.hpp>
|
||||
#include "formatter.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "gui/auxiliary/find_widget.hpp"
|
||||
#ifdef GUI2_EXPERIMENTAL_LISTBOX
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include "gui/widgets/button.hpp"
|
||||
#include "gui/widgets/settings.hpp"
|
||||
#include "gui/widgets/window.hpp"
|
||||
#include "../../formula_debugger.hpp" // We want the file in src/
|
||||
#include "formula/debugger.hpp"
|
||||
#include "utils/foreach.hpp"
|
||||
|
||||
#include <boost/bind.hpp>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "gui/dialogs/game_load.hpp"
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "game_config.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include "desktop/open.hpp"
|
||||
#include "desktop/version.hpp"
|
||||
#include "filesystem.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_config.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "gui/auxiliary/find_widget.hpp"
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include "gui/widgets/settings.hpp"
|
||||
#include "gui/widgets/toggle_button.hpp"
|
||||
#include "gui/widgets/label.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
namespace gui2 {
|
||||
REGISTER_DIALOG(label_settings);
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include "config.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "filesystem.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "network.hpp"
|
||||
#include "log.hpp"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "config.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "network.hpp"
|
||||
#include "utils/foreach.hpp"
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
#include "gui/widgets/toggle_panel.hpp"
|
||||
#include "gui/widgets/tree_view_node.hpp"
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "lobby_preferences.hpp"
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include "mp_ui_alerts.hpp"
|
||||
#include "preferences.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/foreach.hpp>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#include "gui/widgets/settings.hpp"
|
||||
#include "gui/widgets/window.hpp"
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_display.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "log.hpp"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "gui/dialogs/network_transmission.hpp"
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "gui/auxiliary/find_widget.hpp"
|
||||
#include "gui/widgets/button.hpp"
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#include "lobby_preferences.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "video.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "filesystem.hpp"
|
||||
#include "gui/dialogs/message.hpp"
|
||||
#include "gui/auxiliary/find_widget.hpp"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "config.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "make_enum.hpp"
|
||||
#include "utils/make_enum.hpp"
|
||||
#include "gui/dialogs/dialog.hpp"
|
||||
#include "gui/widgets/group.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include "control.hpp"
|
||||
|
||||
#include "font.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gui/auxiliary/iterator/walker_widget.hpp"
|
||||
#include "gui/auxiliary/log.hpp"
|
||||
#include "gui/auxiliary/event/message.hpp"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include "gui/widgets/settings.hpp"
|
||||
#include "sdl/rect.hpp"
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#include <SDL_ttf.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#include "serialization/parser.hpp"
|
||||
#include "serialization/preprocessor.hpp"
|
||||
#include "serialization/schema_validator.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "utils/foreach.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include "gui/widgets/settings.hpp"
|
||||
#include "gui/widgets/window.hpp"
|
||||
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_config.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "help/help.hpp"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include "display.hpp"
|
||||
#include "events.hpp"
|
||||
#include "floating_label.hpp"
|
||||
#include "formula_callable.hpp"
|
||||
#include "formula/callable.hpp"
|
||||
#include "font.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "log.hpp"
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
#include "sdl/utils.hpp"
|
||||
#include "tstring.hpp"
|
||||
#include "utils/foreach.hpp"
|
||||
#include "variant.hpp"
|
||||
#include "formula/variant.hpp"
|
||||
#include "video.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
#define GUI_WIDGETS_WINDOW_HPP_INCLUDED
|
||||
|
||||
#include "cursor.hpp"
|
||||
#include "formula_callable.hpp"
|
||||
#include "formula_function.hpp"
|
||||
#include "formula/callable.hpp"
|
||||
#include "formula/function.hpp"
|
||||
#include "gui/auxiliary/formula.hpp"
|
||||
#include "gui/auxiliary/event/handler.hpp"
|
||||
#include "gui/auxiliary/window_builder.hpp"
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#include "hotkey/hotkey_command.hpp" // for is_scope_active, etc
|
||||
#include "image.hpp" // for get_image, locator
|
||||
#include "log.hpp" // for LOG_STREAM, logger, etc
|
||||
#include "make_enum.hpp" // for operator<<
|
||||
#include "utils/make_enum.hpp" // for operator<<
|
||||
#include "map.hpp" // for gamemap
|
||||
#include "marked-up_text.hpp" // for is_cjk_char, word_wrap_text
|
||||
#include "race.hpp" // for unit_race, etc
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
See the COPYING file for more details.
|
||||
*/
|
||||
|
||||
#include "hotkey_handler.hpp"
|
||||
#include "hotkey/hotkey_handler.hpp"
|
||||
|
||||
#include "actions/create.hpp"
|
||||
#include "formula_string_utils.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_display.hpp"
|
||||
#include "game_errors.hpp"
|
||||
#include "game_events/menu_item.hpp"
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
See the COPYING file for more details.
|
||||
*/
|
||||
|
||||
#include "hotkey_handler_mp.hpp"
|
||||
#include "hotkey/hotkey_handler_mp.hpp"
|
||||
|
||||
#include "hotkey/hotkey_command.hpp"
|
||||
#include "hotkey/hotkey_item.hpp"
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue