MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update logic for zone type checks

develop
Roxy 2023-02-06 15:37:27 -05:00
parent c0358d642d
commit a38246aaa4
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
library/modules/Buildings.cpp
Unescape Escape View File

@ -1589,27 +1589,23 @@ bool Buildings::isPenPasture(df::building * building)
if (!isActivityZone(building)) if (!isActivityZone(building))
return false; return false;
/* TODO: understand how this changes for v50 return ((df::building_civzonest*)building)->type == civzone_type::Pen;
return ((df::building_civzonest*) building)->zone_flags.bits.pen_pasture != 0;
*/ return false;
} }
bool Buildings::isPitPond(df::building * building) bool Buildings::isPitPond(df::building * building)
{ {
if (!isActivityZone(building)) if (!isActivityZone(building))
return false; return false;
/* TODO: understand how this changes for v50
return ((df::building_civzonest*) building)->zone_flags.bits.pit_pond != 0; return ((df::building_civzonest*)building)->type == civzone_type::Pond;
*/ return false;
} }
bool Buildings::isActive(df::building * building) bool Buildings::isActive(df::building * building)
{ {
if (!isActivityZone(building)) if (!isActivityZone(building))
return false; return false;
/* TODO: understand how this changes for v50
return ((df::building_civzonest*) building)->zone_flags.bits.active != 0; return ((df::building_civzonest*)building)->is_active == 8;
*/ return false;
} }
bool Buildings::isHospital(df::building * building) bool Buildings::isHospital(df::building * building)
@ -1625,9 +1621,8 @@ bool Buildings::isHospital(df::building * building)
{ {
if (!isActivityZone(building)) if (!isActivityZone(building))
return false; return false;
/* TODO: understand how this changes for v50
return ((df::building_civzonest*) building)->zone_flags.bits.animal_training != 0; return ((df::building_civzonest*)building)->type == civzone_type::AnimalTraining;
*/ return false;
} }
// returns building of pen/pit at cursor position (NULL if nothing found) // returns building of pen/pit at cursor position (NULL if nothing found)