(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.

2025-08-25 07:29:10 +00:00 · 2010-08-08 10:59:30 +00:00
parent abc14d8fbf
commit 3da3d131c6
101 changed files with 789 additions and 763 deletions
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -479,6 +479,8 @@
    <ClInclude Include="..\src\newgrf_callbacks.h" />
    <ClInclude Include="..\src\newgrf_canal.h" />
    <ClInclude Include="..\src\newgrf_cargo.h" />
+    <ClInclude Include="..\src\newgrf_class.h" />
+    <ClInclude Include="..\src\newgrf_class_func.h" />
    <ClInclude Include="..\src\newgrf_commons.h" />
    <ClInclude Include="..\src\newgrf_config.h" />
    <ClInclude Include="..\src\newgrf_debug.h" />
@@ -502,6 +504,8 @@
    <ClInclude Include="..\src\music\null_m.h" />
    <ClInclude Include="..\src\sound\null_s.h" />
    <ClInclude Include="..\src\video\null_v.h" />
+    <ClInclude Include="..\src\object.h" />
+    <ClInclude Include="..\src\object_type.h" />
    <ClInclude Include="..\src\openttd.h" />
    <ClInclude Include="..\src\order_base.h" />
    <ClInclude Include="..\src\order_func.h" />
@@ -577,8 +581,6 @@
    <ClInclude Include="..\src\transparency_gui.h" />
    <ClInclude Include="..\src\transport_type.h" />
    <ClInclude Include="..\src\tunnelbridge.h" />
-    <ClInclude Include="..\src\unmovable.h" />
-    <ClInclude Include="..\src\unmovable_type.h" />
    <ClInclude Include="..\src\vehicle_base.h" />
    <ClInclude Include="..\src\vehicle_func.h" />
    <ClInclude Include="..\src\vehicle_gui.h" />
@@ -687,6 +689,7 @@
    <ClCompile Include="..\src\group_cmd.cpp" />
    <ClCompile Include="..\src\industry_cmd.cpp" />
    <ClCompile Include="..\src\misc_cmd.cpp" />
+    <ClCompile Include="..\src\object_cmd.cpp" />
    <ClCompile Include="..\src\order_cmd.cpp" />
    <ClCompile Include="..\src\rail_cmd.cpp" />
    <ClCompile Include="..\src\road_cmd.cpp" />
@@ -700,7 +703,6 @@
    <ClCompile Include="..\src\train_cmd.cpp" />
    <ClCompile Include="..\src\tree_cmd.cpp" />
    <ClCompile Include="..\src\tunnelbridge_cmd.cpp" />
-    <ClCompile Include="..\src\unmovable_cmd.cpp" />
    <ClCompile Include="..\src\vehicle_cmd.cpp" />
    <ClCompile Include="..\src\water_cmd.cpp" />
    <ClCompile Include="..\src\waypoint_cmd.cpp" />
@@ -753,6 +755,7 @@
    <ClInclude Include="..\src\table\industry_land.h" />
    <ClInclude Include="..\src\table\landscape_sprite.h" />
    <ClInclude Include="..\src\table\newgrf_debug_data.h" />
+    <ClInclude Include="..\src\table\object_land.h" />
    <ClInclude Include="..\src\table\palette_convert.h" />
    <ClInclude Include="..\src\table\palettes.h" />
    <ClInclude Include="..\src\table\pricebase.h" />
@@ -770,7 +773,6 @@
    <ClInclude Include="..\src\table\train_cmd.h" />
    <ClInclude Include="..\src\table\tree_land.h" />
    <ClInclude Include="..\src\table\unicode.h" />
-    <ClInclude Include="..\src\table\unmovable_land.h" />
    <ClInclude Include="..\src\table\water_land.h" />
    <ClCompile Include="..\src\3rdparty\md5\md5.cpp" />
    <ClInclude Include="..\src\3rdparty\md5\md5.h" />
@@ -995,6 +997,7 @@
    <ClInclude Include="..\src\bridge_map.h" />
    <ClInclude Include="..\src\clear_map.h" />
    <ClInclude Include="..\src\industry_map.h" />
+    <ClInclude Include="..\src\object_map.h" />
    <ClInclude Include="..\src\rail_map.h" />
    <ClCompile Include="..\src\road_map.cpp" />
    <ClInclude Include="..\src\road_map.h" />
@@ -1005,7 +1008,6 @@
    <ClCompile Include="..\src\tunnel_map.cpp" />
    <ClInclude Include="..\src\tunnel_map.h" />
    <ClInclude Include="..\src\tunnelbridge_map.h" />
-    <ClInclude Include="..\src\unmovable_map.h" />
    <ClInclude Include="..\src\void_map.h" />
    <ClInclude Include="..\src\water_map.h" />
    <ClInclude Include="..\src\misc\array.hpp" />
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -640,6 +640,12 @@
    <ClInclude Include="..\src\newgrf_cargo.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\src\newgrf_class.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\newgrf_class_func.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\newgrf_commons.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -709,6 +715,12 @@
    <ClInclude Include="..\src\video\null_v.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\src\object.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\object_type.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\openttd.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -934,12 +946,6 @@
    <ClInclude Include="..\src\tunnelbridge.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\unmovable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\unmovable_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\vehicle_base.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1264,6 +1270,9 @@
    <ClCompile Include="..\src\misc_cmd.cpp">
      <Filter>Command handlers</Filter>
    </ClCompile>
+    <ClCompile Include="..\src\object_cmd.cpp">
+      <Filter>Command handlers</Filter>
+    </ClCompile>
    <ClCompile Include="..\src\order_cmd.cpp">
      <Filter>Command handlers</Filter>
    </ClCompile>
@@ -1303,9 +1312,6 @@
    <ClCompile Include="..\src\tunnelbridge_cmd.cpp">
      <Filter>Command handlers</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\unmovable_cmd.cpp">
-      <Filter>Command handlers</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\vehicle_cmd.cpp">
      <Filter>Command handlers</Filter>
    </ClCompile>
@@ -1462,6 +1468,9 @@
    <ClInclude Include="..\src\table\newgrf_debug_data.h">
      <Filter>Tables</Filter>
    </ClInclude>
+    <ClInclude Include="..\src\table\object_land.h">
+      <Filter>Tables</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\table\palette_convert.h">
      <Filter>Tables</Filter>
    </ClInclude>
@@ -1513,9 +1522,6 @@
    <ClInclude Include="..\src\table\unicode.h">
      <Filter>Tables</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\table\unmovable_land.h">
-      <Filter>Tables</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\table\water_land.h">
      <Filter>Tables</Filter>
    </ClInclude>
@@ -2188,6 +2194,9 @@
    <ClInclude Include="..\src\industry_map.h">
      <Filter>Map Accessors</Filter>
    </ClInclude>
+    <ClInclude Include="..\src\object_map.h">
+      <Filter>Map Accessors</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\rail_map.h">
      <Filter>Map Accessors</Filter>
    </ClInclude>
@@ -2218,9 +2227,6 @@
    <ClInclude Include="..\src\tunnelbridge_map.h">
      <Filter>Map Accessors</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\unmovable_map.h">
-      <Filter>Map Accessors</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\void_map.h">
      <Filter>Map Accessors</Filter>
    </ClInclude>
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1183,6 +1183,14 @@
 				RelativePath=".\..\src\newgrf_cargo.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_class.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_class_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\newgrf_commons.h"
 				>
@@ -1275,6 +1283,14 @@
 				RelativePath=".\..\src\video\null_v.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\object.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\object_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\openttd.h"
 				>
@@ -1575,14 +1591,6 @@
 				RelativePath=".\..\src\tunnelbridge.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\unmovable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\unmovable_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\vehicle_base.h"
 				>
@@ -2031,6 +2039,10 @@
 				RelativePath=".\..\src\misc_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\object_cmd.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\order_cmd.cpp"
 				>
@@ -2083,10 +2095,6 @@
 				RelativePath=".\..\src\tunnelbridge_cmd.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\unmovable_cmd.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\vehicle_cmd.cpp"
 				>
@@ -2303,6 +2311,10 @@
 				RelativePath=".\..\src\table\newgrf_debug_data.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\object_land.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\palette_convert.h"
 				>
@@ -2371,10 +2383,6 @@
 				RelativePath=".\..\src\table\unicode.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\unmovable_land.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\water_land.h"
 				>
@@ -3319,6 +3327,10 @@
 				RelativePath=".\..\src\industry_map.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\object_map.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\rail_map.h"
 				>
@@ -3359,10 +3371,6 @@
 				RelativePath=".\..\src\tunnelbridge_map.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\unmovable_map.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\void_map.h"
 				>
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1180,6 +1180,14 @@
 				RelativePath=".\..\src\newgrf_cargo.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_class.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_class_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\newgrf_commons.h"
 				>
@@ -1272,6 +1280,14 @@
 				RelativePath=".\..\src\video\null_v.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\object.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\object_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\openttd.h"
 				>
@@ -1572,14 +1588,6 @@
 				RelativePath=".\..\src\tunnelbridge.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\unmovable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\unmovable_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\vehicle_base.h"
 				>
@@ -2028,6 +2036,10 @@
 				RelativePath=".\..\src\misc_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\object_cmd.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\order_cmd.cpp"
 				>
@@ -2080,10 +2092,6 @@
 				RelativePath=".\..\src\tunnelbridge_cmd.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\unmovable_cmd.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\vehicle_cmd.cpp"
 				>
@@ -2300,6 +2308,10 @@
 				RelativePath=".\..\src\table\newgrf_debug_data.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\object_land.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\palette_convert.h"
 				>
@@ -2368,10 +2380,6 @@
 				RelativePath=".\..\src\table\unicode.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\unmovable_land.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\water_land.h"
 				>
@@ -3316,6 +3324,10 @@
 				RelativePath=".\..\src\industry_map.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\object_map.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\rail_map.h"
 				>
@@ -3356,10 +3368,6 @@
 				RelativePath=".\..\src\tunnelbridge_map.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\unmovable_map.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\void_map.h"
 				>