|
@@ -506,16 +506,7 @@ void CKingdomInterface::generateObjectsList(const std::vector<const CGObjectInst
|
|
|
for(const CGObjectInstance * object : ownedObjects)
|
|
|
{
|
|
|
//Dwellings
|
|
|
- if(object->ID == Obj::CREATURE_GENERATOR1)
|
|
|
- {
|
|
|
- OwnedObjectInfo & info = visibleObjects[object->subID];
|
|
|
- if(info.count++ == 0)
|
|
|
- {
|
|
|
- info.hoverText = object->getObjectName();
|
|
|
- info.imageID = object->subID;
|
|
|
- }
|
|
|
- }
|
|
|
- else if(auto * dwelling = dynamic_cast<const CGDwelling *>(object))
|
|
|
+ if(auto * dwelling = dynamic_cast<const CGDwelling *>(object))
|
|
|
{
|
|
|
auto kingdomOverviewImage = dwelling->getKingdomOverviewImage();
|
|
|
|
|
@@ -529,6 +520,15 @@ void CKingdomInterface::generateObjectsList(const std::vector<const CGObjectInst
|
|
|
info.imageID = 0;
|
|
|
}
|
|
|
}
|
|
|
+ else if(object->ID == Obj::CREATURE_GENERATOR1)
|
|
|
+ {
|
|
|
+ OwnedObjectInfo & info = visibleObjects[object->subID];
|
|
|
+ if(info.count++ == 0)
|
|
|
+ {
|
|
|
+ info.hoverText = object->getObjectName();
|
|
|
+ info.imageID = object->subID;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//Special objects from idToImage map that should be displayed in objects list
|