Remove AI interface and fallback stage

This removes the C++ common interface intended for creating new AIs. Anyone wishing to create a new AI written in C++ should now implement it as a custom stage instead. This commit also removes the C++ implementation of the Idle AI (but leaves the WML definition of it, which is based on the composite AI) and the fallback stage which was intended to fall back to other C++ AI algorithms.
wesnoth · Mar 24, 2016 · 6c525a9 · 6c525a9
1 parent 5ac2ef6
commit 6c525a9
Show file tree

Hide file tree

Showing 23 changed files with 98 additions and 841 deletions.
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -154,8 +154,6 @@
 		<Unit filename="../../src/ai/configuration.hpp" />
 		<Unit filename="../../src/ai/contexts.cpp" />
 		<Unit filename="../../src/ai/contexts.hpp" />
-		<Unit filename="../../src/ai/default/ai.cpp" />
-		<Unit filename="../../src/ai/default/ai.hpp" />
 		<Unit filename="../../src/ai/default/attack.cpp" />
 		<Unit filename="../../src/ai/default/contexts.cpp" />
 		<Unit filename="../../src/ai/default/contexts.hpp" />
@@ -175,8 +173,6 @@
 		<Unit filename="../../src/ai/game_info.hpp" />
 		<Unit filename="../../src/ai/gamestate_observer.cpp" />
 		<Unit filename="../../src/ai/gamestate_observer.hpp" />
-		<Unit filename="../../src/ai/interface.cpp" />
-		<Unit filename="../../src/ai/interface.hpp" />
 		<Unit filename="../../src/ai/lua/core.cpp" />
 		<Unit filename="../../src/ai/lua/core.hpp" />
 		<Unit filename="../../src/ai/lua/lua_object.cpp" />
@@ -203,8 +199,6 @@
 		<Unit filename="../../src/ai/testing/ca_testing_move_to_targets.hpp" />
 		<Unit filename="../../src/ai/testing/ca_testing_recruitment.cpp" />
 		<Unit filename="../../src/ai/testing/ca_testing_recruitment.hpp" />
-		<Unit filename="../../src/ai/testing/stage_fallback.cpp" />
-		<Unit filename="../../src/ai/testing/stage_fallback.hpp" />
 		<Unit filename="../../src/ai/testing/stage_rca.cpp" />
 		<Unit filename="../../src/ai/testing/stage_rca.hpp" />
 		<Unit filename="../../src/ai/testing/stage_sf_with_rca.cpp" />

diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
@@ -1156,62 +1156,6 @@
 				RelativePath="..\..\src\ai\gamestate_observer.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\ai\interface.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\ai\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\ai\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_with_VLD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\ai\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Test_Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\ai\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Test_Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\ai\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseDEBUG|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\ai\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ai\interface.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\ai\manager.cpp"
 				>
@@ -2067,62 +2011,6 @@
 			<Filter
 				Name="default"
 				>
-				<File
-					RelativePath="..\..\src\ai\default\ai.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\default\"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\default\"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug_with_VLD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\default\"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Test_Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\default\"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Test_Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\default\"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseDEBUG|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\default\"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\ai\default\ai.hpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\src\ai\default\attack.cpp"
 					>
@@ -2515,62 +2403,6 @@
 					RelativePath="..\..\src\ai\testing\ca_testing_recruitment.hpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\src\ai\testing\stage_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\stage_fallback.hpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\src\ai\testing\stage_rca.cpp"
 					>

diff --git a/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj b/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
@@ -236,12 +236,10 @@
 		B54AC6850FEA9C4A006F6FBD /* room_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC67D0FEA9C4A006F6FBD /* room_manager.cpp */; };
 		B54AC6970FEA9E8F006F6FBD /* actions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC68D0FEA9E8F006F6FBD /* actions.cpp */; };
 		B54AC6980FEA9E8F006F6FBD /* configuration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC68F0FEA9E8F006F6FBD /* configuration.cpp */; };
-		B54AC6990FEA9E8F006F6FBD /* interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6910FEA9E8F006F6FBD /* interface.cpp */; };
 		B54AC69A0FEA9E8F006F6FBD /* manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6930FEA9E8F006F6FBD /* manager.cpp */; };
 		B54AC69B0FEA9E8F006F6FBD /* registry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6950FEA9E8F006F6FBD /* registry.cpp */; };
 		B54AC69C0FEA9E8F006F6FBD /* actions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC68D0FEA9E8F006F6FBD /* actions.cpp */; };
 		B54AC69D0FEA9E8F006F6FBD /* configuration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC68F0FEA9E8F006F6FBD /* configuration.cpp */; };
-		B54AC69E0FEA9E8F006F6FBD /* interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6910FEA9E8F006F6FBD /* interface.cpp */; };
 		B54AC69F0FEA9E8F006F6FBD /* manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6930FEA9E8F006F6FBD /* manager.cpp */; };
 		B54AC6A00FEA9E8F006F6FBD /* registry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6950FEA9E8F006F6FBD /* registry.cpp */; };
 		B54AC6C70FEA9EB5006F6FBD /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6A40FEA9EB5006F6FBD /* ai.cpp */; };
@@ -250,27 +248,23 @@
 		B54AC6CA0FEA9EB5006F6FBD /* engine_default.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AA0FEA9EB5006F6FBD /* engine_default.cpp */; };
 		B54AC6CB0FEA9EB5006F6FBD /* rca.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AC0FEA9EB5006F6FBD /* rca.cpp */; };
 		B54AC6CC0FEA9EB5006F6FBD /* stage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AE0FEA9EB5006F6FBD /* stage.cpp */; };
-		B54AC6CD0FEA9EB5006F6FBD /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6B10FEA9EB5006F6FBD /* ai.cpp */; };
 		B54AC6CE0FEA9EB5006F6FBD /* attack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6B30FEA9EB5006F6FBD /* attack.cpp */; };
 		B54AC6CF0FEA9EB5006F6FBD /* contexts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6B40FEA9EB5006F6FBD /* contexts.cpp */; };
 		B54AC6D30FEA9EB5006F6FBD /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6BC0FEA9EB5006F6FBD /* ai.cpp */; };
 		B54AC6D40FEA9EB5006F6FBD /* candidates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6BE0FEA9EB5006F6FBD /* candidates.cpp */; };
 		B54AC6D50FEA9EB5006F6FBD /* ca.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6C10FEA9EB5006F6FBD /* ca.cpp */; };
-		B54AC6D60FEA9EB5006F6FBD /* stage_fallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6C30FEA9EB5006F6FBD /* stage_fallback.cpp */; };
 		B54AC6D70FEA9EB5006F6FBD /* stage_rca.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6C50FEA9EB5006F6FBD /* stage_rca.cpp */; };
 		B54AC6D80FEA9EB5006F6FBD /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6A40FEA9EB5006F6FBD /* ai.cpp */; };
 		B54AC6D90FEA9EB5006F6FBD /* contexts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6A60FEA9EB5006F6FBD /* contexts.cpp */; };
 		B54AC6DA0FEA9EB5006F6FBD /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6A80FEA9EB5006F6FBD /* engine.cpp */; };
 		B54AC6DB0FEA9EB5006F6FBD /* engine_default.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AA0FEA9EB5006F6FBD /* engine_default.cpp */; };
 		B54AC6DC0FEA9EB5006F6FBD /* rca.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AC0FEA9EB5006F6FBD /* rca.cpp */; };
 		B54AC6DD0FEA9EB5006F6FBD /* stage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AE0FEA9EB5006F6FBD /* stage.cpp */; };
-		B54AC6DE0FEA9EB5006F6FBD /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6B10FEA9EB5006F6FBD /* ai.cpp */; };
 		B54AC6DF0FEA9EB5006F6FBD /* attack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6B30FEA9EB5006F6FBD /* attack.cpp */; };
 		B54AC6E00FEA9EB5006F6FBD /* contexts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6B40FEA9EB5006F6FBD /* contexts.cpp */; };
 		B54AC6E40FEA9EB5006F6FBD /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6BC0FEA9EB5006F6FBD /* ai.cpp */; };
 		B54AC6E50FEA9EB5006F6FBD /* candidates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6BE0FEA9EB5006F6FBD /* candidates.cpp */; };
 		B54AC6E60FEA9EB5006F6FBD /* ca.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6C10FEA9EB5006F6FBD /* ca.cpp */; };
-		B54AC6E70FEA9EB5006F6FBD /* stage_fallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6C30FEA9EB5006F6FBD /* stage_fallback.cpp */; };
 		B54AC6E80FEA9EB5006F6FBD /* stage_rca.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6C50FEA9EB5006F6FBD /* stage_rca.cpp */; };
 		B54AC6F30FEA9F92006F6FBD /* lobby.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6EF0FEA9F92006F6FBD /* lobby.cpp */; };
 		B54AC6F40FEA9F92006F6FBD /* transient_message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6F10FEA9F92006F6FBD /* transient_message.cpp */; };
@@ -1486,8 +1480,6 @@
 		B54AC68E0FEA9E8F006F6FBD /* actions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = actions.hpp; sourceTree = "<group>"; };
 		B54AC68F0FEA9E8F006F6FBD /* configuration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = configuration.cpp; sourceTree = "<group>"; };
 		B54AC6900FEA9E8F006F6FBD /* configuration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = configuration.hpp; sourceTree = "<group>"; };
-		B54AC6910FEA9E8F006F6FBD /* interface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = interface.cpp; sourceTree = "<group>"; };
-		B54AC6920FEA9E8F006F6FBD /* interface.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interface.hpp; sourceTree = "<group>"; };
 		B54AC6930FEA9E8F006F6FBD /* manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = manager.cpp; sourceTree = "<group>"; };
 		B54AC6940FEA9E8F006F6FBD /* manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = manager.hpp; sourceTree = "<group>"; };
 		B54AC6950FEA9E8F006F6FBD /* registry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = registry.cpp; sourceTree = "<group>"; };
@@ -1504,8 +1496,6 @@
 		B54AC6AD0FEA9EB5006F6FBD /* rca.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rca.hpp; sourceTree = "<group>"; };
 		B54AC6AE0FEA9EB5006F6FBD /* stage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stage.cpp; sourceTree = "<group>"; };
 		B54AC6AF0FEA9EB5006F6FBD /* stage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stage.hpp; sourceTree = "<group>"; };
-		B54AC6B10FEA9EB5006F6FBD /* ai.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ai.cpp; sourceTree = "<group>"; };
-		B54AC6B20FEA9EB5006F6FBD /* ai.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ai.hpp; sourceTree = "<group>"; };
 		B54AC6B30FEA9EB5006F6FBD /* attack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = attack.cpp; sourceTree = "<group>"; };
 		B54AC6B40FEA9EB5006F6FBD /* contexts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = contexts.cpp; sourceTree = "<group>"; };
 		B54AC6B50FEA9EB5006F6FBD /* contexts.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = contexts.hpp; sourceTree = "<group>"; };
@@ -1515,8 +1505,6 @@
 		B54AC6BF0FEA9EB5006F6FBD /* candidates.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = candidates.hpp; sourceTree = "<group>"; };
 		B54AC6C10FEA9EB5006F6FBD /* ca.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ca.cpp; sourceTree = "<group>"; };
 		B54AC6C20FEA9EB5006F6FBD /* ca.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ca.hpp; sourceTree = "<group>"; };
-		B54AC6C30FEA9EB5006F6FBD /* stage_fallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stage_fallback.cpp; sourceTree = "<group>"; };
-		B54AC6C40FEA9EB5006F6FBD /* stage_fallback.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stage_fallback.hpp; sourceTree = "<group>"; };
 		B54AC6C50FEA9EB5006F6FBD /* stage_rca.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stage_rca.cpp; sourceTree = "<group>"; };
 		B54AC6C60FEA9EB5006F6FBD /* stage_rca.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stage_rca.hpp; sourceTree = "<group>"; };
 		B54AC6EF0FEA9F92006F6FBD /* lobby.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lobby.cpp; sourceTree = "<group>"; };
@@ -3499,8 +3487,6 @@
 		B54AC6B00FEA9EB5006F6FBD /* default */ = {
 			isa = PBXGroup;
 			children = (
-				B54AC6B10FEA9EB5006F6FBD /* ai.cpp */,
-				B54AC6B20FEA9EB5006F6FBD /* ai.hpp */,
 				B54AC6B30FEA9EB5006F6FBD /* attack.cpp */,
 				B54AC6B40FEA9EB5006F6FBD /* contexts.cpp */,
 				B54AC6B50FEA9EB5006F6FBD /* contexts.hpp */,
@@ -3540,8 +3526,6 @@
 				B5CE46FC12A041CE00D665EE /* ca_testing_recruitment.hpp */,
 				B54AC6C10FEA9EB5006F6FBD /* ca.cpp */,
 				B54AC6C20FEA9EB5006F6FBD /* ca.hpp */,
-				B54AC6C30FEA9EB5006F6FBD /* stage_fallback.cpp */,
-				B54AC6C40FEA9EB5006F6FBD /* stage_fallback.hpp */,
 				B54AC6C50FEA9EB5006F6FBD /* stage_rca.cpp */,
 				B54AC6C60FEA9EB5006F6FBD /* stage_rca.hpp */,
 				EC4E3B1E19B2D8480049CBD7 /* stage_sf_with_rca.cpp */,
@@ -3755,8 +3739,6 @@
 				B597EBE20FC082AB00CE81F5 /* game_info.hpp */,
 				B55BE03811234AC700154E6C /* gamestate_observer.cpp */,
 				B55BE03911234AC700154E6C /* gamestate_observer.hpp */,
-				B54AC6910FEA9E8F006F6FBD /* interface.cpp */,
-				B54AC6920FEA9E8F006F6FBD /* interface.hpp */,
 				B52EE9A3121363EB00CFBDAB /* lua */,
 				B54AC6930FEA9E8F006F6FBD /* manager.cpp */,
 				B54AC6940FEA9E8F006F6FBD /* manager.hpp */,
@@ -4369,7 +4351,6 @@
 				B514C70B0F5450CC00E273F0 /* list.cpp in Sources */,
 				EC2F601E1A0490970018C9D6 /* advanced_graphics_options.cpp in Sources */,
 				B54AC6D80FEA9EB5006F6FBD /* ai.cpp in Sources */,
-				B54AC6DE0FEA9EB5006F6FBD /* ai.cpp in Sources */,
 				B54AC6E40FEA9EB5006F6FBD /* ai.cpp in Sources */,
 				B5599B830EC62181008DD061 /* animated_game.cpp in Sources */,
 				F40A13BC1A3A88BA00C4D071 /* apple_notification.mm in Sources */,
@@ -4550,7 +4531,6 @@
 				F419A2C314F5BCFE002F9ADC /* info.cpp in Sources */,
 				62579C7E1573E70C003089D5 /* instance.cpp in Sources */,
 				B597EC150FC0835900CE81F5 /* interface.cpp in Sources */,
-				B54AC69E0FEA9E8F006F6FBD /* interface.cpp in Sources */,
 				B5599B350EC62181008DD061 /* intro.cpp in Sources */,
 				62114CC91750B9AF00CA42C7 /* item_palette.cpp in Sources */,
 				49DA0D2E13550E9B000AFEBD /* iterator.cpp in Sources */,
@@ -4769,7 +4749,6 @@
 				F480CD4B14035038007175D6 /* sourceparser.cpp in Sources */,
 				B5A9BD6D0ECA805A002BE442 /* spacer.cpp in Sources */,
 				B508D2161001560100B12852 /* stacked_widget.cpp in Sources */,
-				B54AC6E70FEA9EB5006F6FBD /* stage_fallback.cpp in Sources */,
 				B54AC6E80FEA9EB5006F6FBD /* stage_rca.cpp in Sources */,
 				EC4E3B2019B2D8480049CBD7 /* stage_sf_with_rca.cpp in Sources */,
 				B59F96E0103478DE00A57C1A /* stage_side_formulas.cpp in Sources */,
@@ -4899,7 +4878,6 @@
 				B597C5B70FACD6CA00CE81F5 /* connect.cpp in Sources */,
 				B597C5C00FACD6CA00CE81F5 /* list.cpp in Sources */,
 				B54AC6C70FEA9EB5006F6FBD /* ai.cpp in Sources */,
-				B54AC6CD0FEA9EB5006F6FBD /* ai.cpp in Sources */,
 				B54AC6D30FEA9EB5006F6FBD /* ai.cpp in Sources */,
 				B597C5AD0FACD6CA00CE81F5 /* animated_game.cpp in Sources */,
 				B52EE8DF121359A600CFBDAB /* arrow.cpp in Sources */,
@@ -4995,7 +4973,6 @@
 				B597C5BC0FACD6CA00CE81F5 /* image.cpp in Sources */,
 				B597C5BF0FACD6CA00CE81F5 /* image.cpp in Sources */,
 				B597EC190FC0835900CE81F5 /* interface.cpp in Sources */,
-				B54AC6990FEA9E8F006F6FBD /* interface.cpp in Sources */,
 				B597C5830FACD6CA00CE81F5 /* intro.cpp in Sources */,
 				B597C5E10FACD6CA00CE81F5 /* key.cpp in Sources */,
 				B597C57E0FACD6CA00CE81F5 /* label.cpp in Sources */,
@@ -5095,7 +5072,6 @@
 				B597C58C0FACD6CA00CE81F5 /* soundsource.cpp in Sources */,
 				B597C54A0FACD6CA00CE81F5 /* spacer.cpp in Sources */,
 				B508D2171001560100B12852 /* stacked_widget.cpp in Sources */,
-				B54AC6D60FEA9EB5006F6FBD /* stage_fallback.cpp in Sources */,
 				B54AC6D70FEA9EB5006F6FBD /* stage_rca.cpp in Sources */,
 				B59F96E3103478DE00A57C1A /* stage_side_formulas.cpp in Sources */,
 				B59F96E4103478DE00A57C1A /* stage_unit_formulas.cpp in Sources */,

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -699,7 +699,6 @@ set(wesnoth-main_SRC
 	ai/composite/stage.cpp
 	ai/configuration.cpp
 	ai/contexts.cpp
-	ai/default/ai.cpp
 	ai/default/attack.cpp
 	ai/default/contexts.cpp
 	ai/formula/ai.cpp
@@ -710,7 +709,6 @@ set(wesnoth-main_SRC
 	ai/formula/stage_unit_formulas.cpp
 	ai/game_info.cpp
 	ai/gamestate_observer.cpp
-	ai/interface.cpp
 	ai/lua/core.cpp
 	ai/lua/lua_object.cpp
 	ai/lua/unit_advancements_aspect.cpp
@@ -724,7 +722,6 @@ set(wesnoth-main_SRC
 	ai/testing/ca_global_fallback.cpp
 	ai/testing/ca_testing_move_to_targets.cpp
 	ai/testing/ca_testing_recruitment.cpp
-	ai/testing/stage_fallback.cpp
 	ai/testing/stage_rca.cpp
 	ai/testing/stage_sf_with_rca.cpp
 	animated_game.cpp