(svn r14951) -Revert: partly what has been done on r14950. That would teach me to update repos before

3 files changed, 4 insertions, 266 deletions

diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index f86d3e964..ba43f71d9 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -2545,122 +2545,6 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Save Load Code"
-			>
-			<File
-				RelativePath=".\..\src\saveload\afterload.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\ai_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\animated_tile_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\autoreplace_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\cargopacket_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\cheat_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\company_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\depot_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\economy_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\engine_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\gamelog_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\group_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\industry_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\map_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\misc_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\newgrf_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\oldloader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\order_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\saveload.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\saveload.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\saveload_internal.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\signs_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\station_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\strings_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\subsidy_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\town_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\vehicle_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\waypoint_sl.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
 			Name="Misc"
 			>
 			<File
@@ -2860,11 +2744,11 @@
 			Name="Music"
 			>
 			<File
-				RelativePath=".\..\src\music\dmusic.cpp"
+				RelativePath=".\..\src\music\null_m.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\null_m.cpp"
+				RelativePath=".\..\src\music\dmusic.cpp"
 				>
 			</File>
 			<File
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index cdf9aaee8..3e1258899 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -2542,122 +2542,6 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Save Load Code"
-			>
-			<File
-				RelativePath=".\..\src\saveload\afterload.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\ai_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\animated_tile_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\autoreplace_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\cargopacket_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\cheat_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\company_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\depot_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\economy_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\engine_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\gamelog_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\group_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\industry_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\map_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\misc_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\newgrf_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\oldloader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\order_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\saveload.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\saveload.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\saveload_internal.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\signs_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\station_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\strings_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\subsidy_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\town_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\vehicle_sl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload\waypoint_sl.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
 			Name="Misc"
 			>
 			<File
@@ -2857,11 +2741,11 @@
 			Name="Music"
 			>
 			<File
-				RelativePath=".\..\src\music\dmusic.cpp"
+				RelativePath=".\..\src\music\null_m.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\null_m.cpp"
+				RelativePath=".\..\src\music\dmusic.cpp"
 				>
 			</File>
 			<File
diff --git a/source.list b/source.list
index ada272b42..fee4cb931 100644
--- a/source.list
+++ b/source.list
@@ -599,36 +599,6 @@ unmovable_map.h
 void_map.h
 water_map.h
 
-# Save Load Code
-saveload/afterload.cpp
-saveload/ai_sl.cpp
-saveload/animated_tile_sl.cpp
-saveload/autoreplace_sl.cpp
-saveload/cargopacket_sl.cpp
-saveload/cheat_sl.cpp
-saveload/company_sl.cpp
-saveload/depot_sl.cpp
-saveload/economy_sl.cpp
-saveload/engine_sl.cpp
-saveload/gamelog_sl.cpp
-saveload/group_sl.cpp
-saveload/industry_sl.cpp
-saveload/map_sl.cpp
-saveload/misc_sl.cpp
-saveload/newgrf_sl.cpp
-saveload/oldloader.cpp
-saveload/order_sl.cpp
-saveload/saveload.cpp
-saveload/saveload.h
-saveload/saveload_internal.h
-saveload/signs_sl.cpp
-saveload/station_sl.cpp
-saveload/strings_sl.cpp
-saveload/subsidy_sl.cpp
-saveload/town_sl.cpp
-saveload/vehicle_sl.cpp
-saveload/waypoint_sl.cpp
-
 # Misc
 misc/array.hpp
 misc/binaryheap.hpp