diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/proto/RemoteFortressReader.proto index a54a0397f..864cdba1a 100644 --- a/plugins/proto/RemoteFortressReader.proto +++ b/plugins/proto/RemoteFortressReader.proto @@ -642,33 +642,6 @@ message WorldMap repeated RegionTile region_tiles = 25; } -enum SiteRealizationBuildingType -{ - cottage_plot = 0; - castle_wall = 1; - castle_tower = 2; - castle_courtyard = 3; - house = 4; - temple = 5; - tomb = 6; - shop_house = 7; - warehouse = 8; - market_square = 9; - pasture = 10; - waste = 11; - courtyard = 12; - well = 13; - vault = 14; - great_tower = 15; - trenches = 16; - tree_house = 17; - hillock_house = 18; - mead_hall = 19; - fortress_entrance = 20; - library = 21; - tavern = 22; -} - message SiteRealizationBuildingWall { optional int32 start_x = 1; @@ -702,7 +675,6 @@ message SiteRealizationBuildingTrenches message SiteRealizationBuilding { optional int32 id = 1; - optional SiteRealizationBuildingType type = 2; optional int32 min_x = 3; optional int32 min_y = 4; optional int32 max_x = 5; @@ -711,6 +683,7 @@ message SiteRealizationBuilding optional SiteRealizationBuildingWall wall_info = 8; optional SiteRealizationBuildingTower tower_info = 9; optional SiteRealizationBuildingTrenches trench_info = 10; + optional int32 type = 11; } message RegionTile diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp index e94c3f832..7e654c727 100644 --- a/plugins/remotefortressreader/remotefortressreader.cpp +++ b/plugins/remotefortressreader/remotefortressreader.cpp @@ -2541,7 +2541,7 @@ static void CopyLocalMap(df::world_data * worldData, df::world_region_details* w out_building->set_id(in_building->id); #if DF_VERSION_INT > 34011 - out_building->set_type((SiteRealizationBuildingType)in_building->type); + out_building->set_type(in_building->type); #endif out_building->set_min_x(in_building->min_x - (site_x * 48)); out_building->set_min_y(in_building->min_y - (site_y * 48));