dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename town zone extended variable identifiers

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-04-13 20:53:11 +01:00
parent ac0c8c8cdd
commit 9fd01d57cc
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf_extension.cpp
View File

@@ -177,11 +177,11 @@ extern const GRFVariableMapDefinition _grf_action2_remappable_variables[] = {
GRFVariableMapDefinition(GSF_SIGNALS, A2VRI_SIGNALS_SIGNAL_VERTICAL_CLEARANCE, "signals_signal_vertical_clearance"), GRFVariableMapDefinition(GSF_SIGNALS, A2VRI_SIGNALS_SIGNAL_VERTICAL_CLEARANCE, "signals_signal_vertical_clearance"),
GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_HOUSE_COUNT, "town_house_count"), GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_HOUSE_COUNT, "town_house_count"),
GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_POPULATION, "town_population"), GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_POPULATION, "town_population"),
GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_ZONE_0, "town_zone_0_radius_square"), GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_ZONE_0, "town_zone_0_radius_square"),
GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_ZONE_1, "town_zone_1_radius_square"), GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_ZONE_1, "town_zone_1_radius_square"),
GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_ZONE_2, "town_zone_2_radius_square"), GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_ZONE_2, "town_zone_2_radius_square"),
GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_ZONE_3, "town_zone_3_radius_square"), GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_ZONE_3, "town_zone_3_radius_square"),
GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_ZONE_4, "town_zone_4_radius_square"), GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_ZONE_4, "town_zone_4_radius_square"),
GRFVariableMapDefinition(GSF_NEWLANDSCAPE, 0x40, "newlandscape_terrain_type"), GRFVariableMapDefinition(GSF_NEWLANDSCAPE, 0x40, "newlandscape_terrain_type"),
GRFVariableMapDefinition(GSF_NEWLANDSCAPE, 0x41, "newlandscape_tile_slope"), GRFVariableMapDefinition(GSF_NEWLANDSCAPE, 0x41, "newlandscape_tile_slope"),
GRFVariableMapDefinition(GSF_NEWLANDSCAPE, 0x42, "newlandscape_tile_height"), GRFVariableMapDefinition(GSF_NEWLANDSCAPE, 0x42, "newlandscape_tile_height"),

10
src/newgrf_extension.h
View File

@@ -91,11 +91,11 @@ enum Action2VariableRemapIds {
A2VRI_SIGNALS_SIGNAL_VERTICAL_CLEARANCE, A2VRI_SIGNALS_SIGNAL_VERTICAL_CLEARANCE,
A2VRI_TOWNS_HOUSE_COUNT, A2VRI_TOWNS_HOUSE_COUNT,
A2VRI_TOWNS_POPULATION, A2VRI_TOWNS_POPULATION,
A2VRI_ZONE_0, A2VRI_TOWNS_ZONE_0,
A2VRI_ZONE_1, A2VRI_TOWNS_ZONE_1,
A2VRI_ZONE_2, A2VRI_TOWNS_ZONE_2,
A2VRI_ZONE_3, A2VRI_TOWNS_ZONE_3,
A2VRI_ZONE_4, A2VRI_TOWNS_ZONE_4,
}; };
enum GRFFeatureTestObservationFlag : uint8 { enum GRFFeatureTestObservationFlag : uint8 {

22
src/newgrf_town.cpp
View File

@@ -113,12 +113,12 @@
case A2VRI_TOWNS_HOUSE_COUNT: return this->t->cache.num_houses; case A2VRI_TOWNS_HOUSE_COUNT: return this->t->cache.num_houses;
case A2VRI_TOWNS_POPULATION: return this->t->cache.population; case A2VRI_TOWNS_POPULATION: return this->t->cache.population;
case A2VRI_ZONE_0: case A2VRI_TOWNS_ZONE_0:
case A2VRI_ZONE_1: case A2VRI_TOWNS_ZONE_1:
case A2VRI_ZONE_2: case A2VRI_TOWNS_ZONE_2:
case A2VRI_ZONE_3: case A2VRI_TOWNS_ZONE_3:
case A2VRI_ZONE_4: case A2VRI_TOWNS_ZONE_4:
return this->t->cache.squared_town_zone_radius[variable - A2VRI_ZONE_0]; return this->t->cache.squared_town_zone_radius[variable - A2VRI_TOWNS_ZONE_0];
} }
DEBUG(grf, 1, "Unhandled town variable 0x%X", variable); DEBUG(grf, 1, "Unhandled town variable 0x%X", variable);
@@ -175,11 +175,11 @@
case 0xD3: case 0xD4: case 0xD5: case 0xD3: case 0xD4: case 0xD5:
case A2VRI_TOWNS_HOUSE_COUNT: case A2VRI_TOWNS_HOUSE_COUNT:
case A2VRI_TOWNS_POPULATION: case A2VRI_TOWNS_POPULATION:
case A2VRI_ZONE_0: case A2VRI_TOWNS_ZONE_0:
case A2VRI_ZONE_1: case A2VRI_TOWNS_ZONE_1:
case A2VRI_ZONE_2: case A2VRI_TOWNS_ZONE_2:
case A2VRI_ZONE_3: case A2VRI_TOWNS_ZONE_3:
case A2VRI_ZONE_4: case A2VRI_TOWNS_ZONE_4:
return 0; return 0;
} }

10
src/table/newgrf_debug_data.h
View File

@@ -1634,11 +1634,11 @@ static const NIVariable _niv_towns[] = {
NIV(0xB6, "number of buildings"), NIV(0xB6, "number of buildings"),
NIV(A2VRI_TOWNS_HOUSE_COUNT, "number of buildings (uncapped)"), NIV(A2VRI_TOWNS_HOUSE_COUNT, "number of buildings (uncapped)"),
NIV(A2VRI_TOWNS_POPULATION, "population (uncapped)"), NIV(A2VRI_TOWNS_POPULATION, "population (uncapped)"),
NIV(A2VRI_ZONE_0, "zone radius 0 (uncapped)"), NIV(A2VRI_TOWNS_ZONE_0, "zone radius 0 (uncapped)"),
NIV(A2VRI_ZONE_1, "zone radius 1 (uncapped)"), NIV(A2VRI_TOWNS_ZONE_1, "zone radius 1 (uncapped)"),
NIV(A2VRI_ZONE_2, "zone radius 2 (uncapped)"), NIV(A2VRI_TOWNS_ZONE_2, "zone radius 2 (uncapped)"),
NIV(A2VRI_ZONE_3, "zone radius 3 (uncapped)"), NIV(A2VRI_TOWNS_ZONE_3, "zone radius 3 (uncapped)"),
NIV(A2VRI_ZONE_4, "zone radius 4 (uncapped)"), NIV(A2VRI_TOWNS_ZONE_4, "zone radius 4 (uncapped)"),
NIV_END() NIV_END()
}; };