Merge https://github.com/rh73/dfhack

plugins/probe.cpp

@@ -382,12 +382,15 @@ command_result df_bprobe (color_ostream &out, vector <string> & parameters)
                 out.print(", subtype %i", building.subtype);
             break;
         }
-        if(building.origin->isRoom())
+        if(building.origin->is_room)  //isRoom())
             out << ", is room";
         else
             out << ", not a room";
+        if(building.origin->getBuildStage()!=building.origin->getMaxBuildStage())
+            out << ", in construction";
         out.print("\n");
 
+
     }
     return CR_OK;
 }

plugins/rename.cpp

@@ -150,7 +150,7 @@ static command_result rename(color_ostream &out, vector <string> &parameters)
         if (parameters.size() != 2)
             return CR_WRONG_USAGE;
 
-        df::unit *unit = Gui::getSelectedUnit(out);
+        df::unit *unit = Gui::getSelectedUnit(out, true);
         if (!unit)
             return CR_WRONG_USAGE;
 
@@ -161,7 +161,7 @@ static command_result rename(color_ostream &out, vector <string> &parameters)
         if (parameters.size() != 2)
             return CR_WRONG_USAGE;
 
-        df::unit *unit = Gui::getSelectedUnit(out);
+        df::unit *unit = Gui::getSelectedUnit(out, true);
         if (!unit)
             return CR_WRONG_USAGE;
 

plugins/tweak.cpp

@@ -140,7 +140,7 @@ static command_result tweak(color_ostream &out, vector <string> &parameters)
 
     if (cmd == "clear-missing")
     {
-        df::unit *unit = getSelectedUnit(out);
+        df::unit *unit = getSelectedUnit(out, true);
         if (!unit)
             return CR_FAILURE;
 
@@ -157,7 +157,7 @@ static command_result tweak(color_ostream &out, vector <string> &parameters)
     }
     else if (cmd == "clear-ghostly")
     {
-        df::unit *unit = getSelectedUnit(out);
+        df::unit *unit = getSelectedUnit(out, true);
         if (!unit)
             return CR_FAILURE;
 
@@ -176,13 +176,9 @@ static command_result tweak(color_ostream &out, vector <string> &parameters)
     }
     else if (cmd == "fixmigrant")
     {
-        df::unit *unit = getSelectedUnit(out);
+        df::unit *unit = getSelectedUnit(out, true);
-
         if (!unit)
-        {
-            out << "No unit selected!" << endl;
             return CR_FAILURE;
-        }
         
         if(unit->race != df::global::ui->race_id)
         {
@@ -213,12 +209,10 @@ static command_result tweak(color_ostream &out, vector <string> &parameters)
     {
         // force a unit into your fort, regardless of civ or race
         // allows to "steal" caravan guards etc
-        df::unit *unit = getSelectedUnit(out);
+        df::unit *unit = getSelectedUnit(out, true);
         if (!unit)
-        {
-            out << "No unit selected!" << endl;
             return CR_FAILURE;
-        }
+
         if (unit->flags2.bits.resident)
             unit->flags2.bits.resident = 0;
         if(unit->flags1.bits.merchant)

plugins/zone.cpp

@@ -897,6 +897,10 @@ int32_t findCageAtCursor()
             building->z == cursor->z))
             continue;
 
+        // don't set id if cage is not constructed yet
+        if(building->getBuildStage()!=building->getMaxBuildStage())
+            break;
+
         if(isCage(building))
         {
             foundID = building->id;
@@ -1065,10 +1069,10 @@ bool isInBuiltCageRoom(df::unit* unit)
     {
         df::building* building = world->buildings.all[b];
         
-        // !!! for whatever reason isRoom() returns true if a cage is not a room
+        // !!! building->isRoom() returns true if the building can be made a room but currently isn't
-        // !!! and false if it was defined as a room/zoo ingame
+        // !!! except for coffins/tombs which always return false
-        // !!! (seems not general behaviour, activity zones return false, for example)
+        // !!! using the bool is_room however gives the correct state/value
-        if(building->isRoom())
+        if(!building->is_room)
             continue;
         
         if(building->getType() == building_type::Cage)
@@ -1122,6 +1126,10 @@ df::building * getBuiltCageAtPos(df::coord pos)
             && building->y1 == pos.y
             && building->z  == pos.z )
         {
+            // don't set pointer if not constructed yet
+            if(building->getBuildStage()!=building->getMaxBuildStage())
+                break;
+
             cage = building;
             break;
         }
@@ -1594,11 +1602,6 @@ void zoneInfo(color_ostream & out, df::building* building, bool verbose)
     else
         out << "not active";
 
-    //if(building->isRoom())
-    //    out <<", room";
-    //else
-    //    out << ", not a room";
-
     if(civ->zone_flags.bits.pen_pasture)
         out << ", pen/pasture";
     else if (civ->zone_flags.bits.pit_pond)
@@ -1655,16 +1658,7 @@ void cageInfo(color_ostream & out, df::building* building, bool verbose)
         << " z:" << building->z
         << endl;
 
-    //if(building->isRoom())
-    //    out <<", bldg room";
-    //else
-    //    out << ", bldg not a room";
-
     df::building_cagest * cage = (df::building_cagest*) building;
-    //if(cage->isRoom())
-    //    out <<", cage is room";
-    //else
-    //    out << ", cage is not a room";
 
     int32_t creaturecount = cage->assigned_creature.size();
     out << "Creatures in this cage: " << creaturecount << endl;
@@ -2465,12 +2459,9 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
         else
         {
             // must have unit selected
-            df::unit *unit = getSelectedUnit(out);
+            df::unit *unit = getSelectedUnit(out, true);
             if (!unit)
-            {
-                out << "No unit selected." << endl;
                 return CR_WRONG_USAGE;
-            }
 
             if(unit_info)
             {
@@ -2503,18 +2494,16 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
     if(building_unassign)
     {
         // must have unit selected
-        df::unit *unit = getSelectedUnit(out);
+        df::unit *unit = getSelectedUnit(out, true);
         if (!unit)
-        {
-            out << "No unit selected." << endl;
             return CR_WRONG_USAGE;
-        }
 
         // remove assignment reference from unit and old zone
         if(unassignUnitFromBuilding(unit))
             out << "Unit unassigned." << endl;
         else
             out << "Unit is not assigned to an activity zone!" << endl;
+        
         return CR_OK;
     }