Преглед на файлове

Implement IOwnableObject interface for shipyard

Ivan Savenko преди 1 година
родител
ревизия
dae9e1e316
променени са 2 файла, в които са добавени 20 реда и са изтрити 1 реда
  1. 15 0
      lib/mapObjects/MiscObjects.cpp
  2. 5 1
      lib/mapObjects/MiscObjects.h

+ 15 - 0
lib/mapObjects/MiscObjects.cpp

@@ -1227,6 +1227,21 @@ BoatId CGShipyard::getBoatType() const
 	return createdBoat;
 	return createdBoat;
 }
 }
 
 
+const IOwnableObject * CGShipyard::asOwnable() const
+{
+	return this;
+}
+
+ResourceSet CGShipyard::dailyIncome() const
+{
+	return {};
+}
+
+std::vector<CreatureID> CGShipyard::providedCreatures() const
+{
+	return {};
+}
+
 void CGDenOfthieves::onHeroVisit (const CGHeroInstance * h) const
 void CGDenOfthieves::onHeroVisit (const CGHeroInstance * h) const
 {
 {
 	cb->showObjectWindow(this, EOpenWindowMode::THIEVES_GUILD, h, false);
 	cb->showObjectWindow(this, EOpenWindowMode::THIEVES_GUILD, h, false);

+ 5 - 1
lib/mapObjects/MiscObjects.h

@@ -346,7 +346,7 @@ public:
 	}
 	}
 };
 };
 
 
-class DLL_LINKAGE CGShipyard : public CGObjectInstance, public IShipyard
+class DLL_LINKAGE CGShipyard : public CGObjectInstance, public IShipyard, public IOwnableObject
 {
 {
 	friend class ShipyardInstanceConstructor;
 	friend class ShipyardInstanceConstructor;
 
 
@@ -358,6 +358,10 @@ protected:
 	const IObjectInterface * getObject() const override;
 	const IObjectInterface * getObject() const override;
 	BoatId getBoatType() const override;
 	BoatId getBoatType() const override;
 
 
+	const IOwnableObject * asOwnable() const final;
+	ResourceSet dailyIncome() const override;
+	std::vector<CreatureID> providedCreatures() const override;
+
 public:
 public:
 	using CGObjectInstance::CGObjectInstance;
 	using CGObjectInstance::CGObjectInstance;