Skip to content

Commit

Permalink
Remove global fallback candidate action
Browse files Browse the repository at this point in the history 
This literally did nothing except place useless labels on the map.
  • Loading branch information
@CelticMinstrel
CelticMinstrel committed Mar 24, 2016
1 parent d73a248 commit fbd9edd
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 239 deletions.
2 changes: 0 additions & 2 deletions projectfiles/CodeBlocks/wesnoth.cbp
View file
Expand Up @@ -191,8 +191,6 @@
<Unit filename="../../src/ai/testing/aspect_attacks.hpp" />
<Unit filename="../../src/ai/testing/ca.cpp" />
<Unit filename="../../src/ai/testing/ca.hpp" />
<Unit filename="../../src/ai/testing/ca_global_fallback.cpp" />
<Unit filename="../../src/ai/testing/ca_global_fallback.hpp" />
<Unit filename="../../src/ai/testing/ca_testing_move_to_targets.cpp" />
<Unit filename="../../src/ai/testing/ca_testing_move_to_targets.hpp" />
<Unit filename="../../src/ai/testing/ca_testing_recruitment.cpp" />
Expand Down
56 changes: 0 additions & 56 deletions projectfiles/VC9/wesnoth.vcproj
View file
Expand Up @@ -2235,62 +2235,6 @@
RelativePath="..\..\src\ai\testing\ca.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\testing\ca_global_fallback.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_with_VLD|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDEBUG|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\ai\testing\ca_global_fallback.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\testing\ca_testing_move_to_targets.cpp"
>
Expand Down
6 changes: 0 additions & 6 deletions projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
View file
Expand Up @@ -23,7 +23,6 @@
49DA0D2E13550E9B000AFEBD /* iterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49DA0D2B13550E9B000AFEBD /* iterator.cpp */; };
49DA0D2F13550E9B000AFEBD /* walker_grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49DA0D2C13550E9B000AFEBD /* walker_grid.cpp */; };
49DA0D3013550E9B000AFEBD /* walker_widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49DA0D2D13550E9B000AFEBD /* walker_widget.cpp */; };
49DA0D3613550F27000AFEBD /* ca_global_fallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49DA0D3513550F27000AFEBD /* ca_global_fallback.cpp */; };
49E84DC217384EF800A4F376 /* leader_scroll_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49E84DC017384EF800A4F376 /* leader_scroll_dialog.cpp */; };
620091C31575C784009AA2C9 /* filter_options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 620091C11575C784009AA2C9 /* filter_options.cpp */; };
620A386E15E9364E00A4F513 /* attack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 620A386215E9364E00A4F513 /* attack.cpp */; };
Expand Down Expand Up @@ -1109,7 +1108,6 @@
49DA0D2B13550E9B000AFEBD /* iterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iterator.cpp; path = iterator/iterator.cpp; sourceTree = "<group>"; };
49DA0D2C13550E9B000AFEBD /* walker_grid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = walker_grid.cpp; path = iterator/walker_grid.cpp; sourceTree = "<group>"; };
49DA0D2D13550E9B000AFEBD /* walker_widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = walker_widget.cpp; path = iterator/walker_widget.cpp; sourceTree = "<group>"; };
49DA0D3513550F27000AFEBD /* ca_global_fallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ca_global_fallback.cpp; sourceTree = "<group>"; };
49E84DC017384EF800A4F376 /* leader_scroll_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = leader_scroll_dialog.cpp; sourceTree = "<group>"; };
49E84DC117384EF800A4F376 /* leader_scroll_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = leader_scroll_dialog.hpp; sourceTree = "<group>"; };
620091C11575C784009AA2C9 /* filter_options.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filter_options.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2284,7 +2282,6 @@
F419E43E13354E220031448A /* teleport.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = teleport.hpp; sourceTree = "<group>"; };
F419E44313354E620031448A /* lua_jailbreak_exception.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_jailbreak_exception.hpp; sourceTree = "<group>"; };
F419E44413354E620031448A /* lua_jailbreak_exception.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_jailbreak_exception.cpp; sourceTree = "<group>"; };
F419E46213354F8D0031448A /* ca_global_fallback.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ca_global_fallback.hpp; sourceTree = "<group>"; };
F419E485133550FB0031448A /* drawing.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drawing.hpp; sourceTree = "<group>"; };
F444907513C5483E003B6442 /* joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = joystick.cpp; sourceTree = "<group>"; };
F444907613C5483E003B6442 /* joystick.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = joystick.hpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3515,8 +3512,6 @@
children = (
B59F96E51034791200A57C1A /* aspect_attacks.cpp */,
B59F96E61034791200A57C1A /* aspect_attacks.hpp */,
49DA0D3513550F27000AFEBD /* ca_global_fallback.cpp */,
F419E46213354F8D0031448A /* ca_global_fallback.hpp */,
B552D92A108694BB002D8F86 /* ca_testing_move_to_targets.cpp */,
B552D92B108694BB002D8F86 /* ca_testing_move_to_targets.hpp */,
B5CE46FB12A041CE00D665EE /* ca_testing_recruitment.cpp */,
Expand Down Expand Up @@ -4355,7 +4350,6 @@
62D24F2D1519982500350848 /* brush.cpp in Sources */,
B5599AD40EC62181008DD061 /* button.cpp in Sources */,
B5A9BD5B0ECA805A002BE442 /* button.cpp in Sources */,
49DA0D3613550F27000AFEBD /* ca_global_fallback.cpp in Sources */,
B552D92D108694BB002D8F86 /* ca_testing_move_to_targets.cpp in Sources */,
B5CE46FD12A041CE00D665EE /* ca_testing_recruitment.cpp in Sources */,
B54AC6E60FEA9EB5006F6FBD /* ca.cpp in Sources */,
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
View file
Expand Up @@ -718,7 +718,6 @@ set(wesnoth-main_SRC
ai/testing.cpp
ai/testing/aspect_attacks.cpp
ai/testing/ca.cpp
ai/testing/ca_global_fallback.cpp
ai/testing/ca_testing_move_to_targets.cpp
ai/testing/ca_testing_recruitment.cpp
ai/testing/stage_rca.cpp
Expand Down
1 change: 0 additions & 1 deletion src/SConscript
View file
Expand Up @@ -243,7 +243,6 @@ wesnoth_sources = Split("""
ai/testing.cpp
ai/testing/aspect_attacks.cpp
ai/testing/ca.cpp
ai/testing/ca_global_fallback.cpp
ai/testing/ca_testing_move_to_targets.cpp
ai/testing/ca_testing_recruitment.cpp
ai/testing/stage_rca.cpp
Expand Down
7 changes: 0 additions & 7 deletions src/ai/registry.cpp
View file
Expand Up @@ -36,7 +36,6 @@
#include "recruitment/recruitment.hpp" // for recruitment
#include "testing/aspect_attacks.hpp" // for aspect_attacks
#include "testing/ca.hpp" // for leader_shares_keep_phase, etc
#include "testing/ca_global_fallback.hpp" // for global_fallback_phase
#include "testing/ca_testing_move_to_targets.hpp"
#include "testing/ca_testing_recruitment.hpp"
#include "testing/stage_sf_with_rca.hpp"
Expand Down Expand Up @@ -122,9 +121,6 @@ static register_candidate_action_factory<testing_ai_default::leader_shares_keep_
static register_candidate_action_factory<testing_ai_default::leader_shares_keep_phase>
passive_leader_shares_keep_phase_factory("ai_default_rca::passive_leader_shares_keep_phase");

static register_candidate_action_factory<testing_ai_default::global_fallback_phase>
global_fallback_phase_factory("ai_default_rca::global_fallback_phase");

static register_candidate_action_factory<default_recruitment::recruitment>
default_recruitment_factory("default_recruitment::recruitment");

Expand Down Expand Up @@ -168,9 +164,6 @@ static register_candidate_action_factory<testing_ai_default::testing_recruitment
static register_candidate_action_factory<testing_ai_default::leader_shares_keep_phase>
old_passive_leader_shares_keep_phase_factory("testing_ai_default::passive_leader_shares_keep_phase");

static register_candidate_action_factory<testing_ai_default::global_fallback_phase>
old_global_fallback_phase_factory("testing_ai_default::global_fallback_phase");

// =======================================================================
// Goals
// =======================================================================
Expand Down
107 changes: 0 additions & 107 deletions src/ai/testing/ca_global_fallback.cpp
View file

This file was deleted.

59 changes: 0 additions & 59 deletions src/ai/testing/ca_global_fallback.hpp
View file

This file was deleted.

0 comments on commit fbd9edd

Please sign in to comment.