build_menu: clarify logic for altar preview

Author: dalerank

src/building/building.h

@@ -140,7 +140,7 @@ enum e_fancy_state {
 class building_work_camp;
 class building_farm;
 
-building* building_get(int id);
+building* building_get(building_id id);
 
 class building {
 public:

src/building/building_menu.cpp

@@ -12,6 +12,7 @@
 #include "core/game_environment.h"
 #include "io/gamefiles/lang.h"
 #include "building/industry.h"
+#include "building/building_temple_complex.h"
 
 #include "dev/debug.h"
 #include "js/js_game.h"
@@ -382,11 +383,11 @@ void building_menu_update_temple_complexes() {
         }
 
         // check if upgrades have been placed
-        building* b = building_get(temple_complex_id);
-        const bool temple_has_altar = (b->data.monuments.temple_complex_attachments & 2); // altar
+        auto b = building_get_ex<building_temple_complex>(temple_complex_id);
+        const bool temple_has_altar = b && b->has_attachement(etc_attachement_altar);
         building_menu_toggle_building(BUILDING_TEMPLE_COMPLEX_ALTAR, !temple_has_altar);
 
-        const bool temple_has_oracle = (b->data.monuments.temple_complex_attachments & 1); // oracle
+        const bool temple_has_oracle = b && b->has_attachement(etc_attachement_oracle);
         building_menu_toggle_building(BUILDING_TEMPLE_COMPLEX_ORACLE, !temple_has_oracle);
 
         // all upgrades have been placed!

src/building/construction/build_planner.cpp

@@ -800,21 +800,22 @@ void build_planner::update_special_case_orientations_check() {
         }
     }
 
-    const bool templeAltar = (special_flags & e_building_flag::TempleUpgradeAltar);
-    const bool templeOracle = (special_flags & e_building_flag::TempleUpgradeOracle);
-    if (templeAltar || templeOracle) {
+    const bool temple_altar = (special_flags & e_building_flag::TempleUpgradeAltar);
+    const bool temple_oracle = (special_flags & e_building_flag::TempleUpgradeOracle);
+    const int temple_options = (temple_altar ? etc_attachement_altar : 0) | (temple_oracle ? etc_attachement_oracle : 0);
+    if (temple_altar || temple_oracle) {
         auto target = building_at(end)->main()->dcast_temple_complex();
         if (!target) {
             immediate_warning_id = WARNING_TEMPLE_UPGRADE_PLACEMENT_NEED_TEMPLE;
             can_place = CAN_NOT_PLACE;
-        } else if (target->data.monuments.temple_complex_attachments & additional_req_param1) {
+        } else if (target->has_attachement((e_temple_compex_attachement)temple_options) ) {
             immediate_warning_id = WARNING_TEMPLE_UPGRADE_ONLY_ONE;
             can_place = CAN_NOT_PLACE;
         } else {
             int dir_absolute = (5 - (target->data.monuments.variant / 2)) % 4;
             dir_relative = city_view_relative_orientation(dir_absolute);
             relative_orientation = (1 + dir_relative) % 2;
-            end = temple_complex_part_target(&target->base, additional_req_param1);
+            end = target->tile();
             update_orientations(false);
         }
     }