Explorar el Código

code review; higher prio for custom image

Laserlicht hace 1 mes
padre
commit
2189e9722f
Se han modificado 2 ficheros con 11 adiciones y 11 borrados
  1. 10 10
      client/windows/CKingdomInterface.cpp
  2. 1 1
      docs/modders/Map_Objects/Dwelling.md

+ 10 - 10
client/windows/CKingdomInterface.cpp

@@ -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

+ 1 - 1
docs/modders/Map_Objects/Dwelling.md

@@ -24,7 +24,7 @@
 		{ "amount" : 12, "type" : "earthElemental" }
 	],
 
-	/// Optional image showed on kingdom overview (animation; only frame 0 displayed)
+	/// Image showed on kingdom overview (animation; only frame 0 displayed)
 	"kingdomOverviewImage" : "image.def"
 }
 ```