Sfoglia il codice sorgente

Merge pull request #1636 from rilian-la-te/remove-unused

vcmi: remove old war machine code
Ivan Savenko 2 anni fa
parent
commit
c8afef3408
4 ha cambiato i file con 0 aggiunte e 45 eliminazioni
  1. 0 22
      lib/CArtHandler.cpp
  2. 0 2
      lib/CArtHandler.h
  3. 0 20
      lib/CCreatureHandler.cpp
  4. 0 1
      lib/CCreatureHandler.h

+ 0 - 22
lib/CArtHandler.cpp

@@ -197,28 +197,6 @@ void CArtifact::serializeJson(JsonSerializeFormat & handler)
 
 }
 
-void CArtifact::fillWarMachine()
-{
-	switch(id)
-	{
-	case ArtifactID::CATAPULT:
-		warMachine = CreatureID::CATAPULT;
-		break;
-	case ArtifactID::BALLISTA:
-		warMachine = CreatureID::BALLISTA;
-		break;
-	case ArtifactID::FIRST_AID_TENT:
-		warMachine = CreatureID::FIRST_AID_TENT;
-		break;
-	case ArtifactID::AMMO_CART:
-		warMachine = CreatureID::AMMO_CART;
-		break;
-	default:
-		warMachine = CreatureID::NONE;
-		break;
-	}
-}
-
 void CGrowingArtifact::levelUpArtifact (CArtifactInstance * art)
 {
 	auto b = std::make_shared<Bonus>();

+ 0 - 2
lib/CArtHandler.h

@@ -115,8 +115,6 @@ public:
 	~CArtifact();
 
 	friend class CArtHandler;
-private:
-	void fillWarMachine();
 };
 
 class DLL_LINKAGE CGrowingArtifact : public CArtifact //for example commander artifacts getting bonuses after battle

+ 0 - 20
lib/CCreatureHandler.cpp

@@ -410,26 +410,6 @@ void CCreature::serializeJson(JsonSerializeFormat & handler)
 	}
 }
 
-void CCreature::fillWarMachine()
-{
-	switch (idNumber)
-	{
-	case CreatureID::CATAPULT: //Catapult
-		warMachine = ArtifactID::CATAPULT;
-		break;
-	case CreatureID::BALLISTA: //Ballista
-		warMachine = ArtifactID::BALLISTA;
-		break;
-	case CreatureID::FIRST_AID_TENT: //First Aid tent
-		warMachine = ArtifactID::FIRST_AID_TENT;
-		break;
-	case CreatureID::AMMO_CART: //Ammo cart
-		warMachine = ArtifactID::AMMO_CART;
-		break;
-	}
-	warMachine = ArtifactID::NONE; //this creature is not artifact
-}
-
 CCreatureHandler::CCreatureHandler()
 	: expAfterUpgrade(0)
 {

+ 0 - 1
lib/CCreatureHandler.h

@@ -253,7 +253,6 @@ public:
 	CCreature();
 
 private:
-	void fillWarMachine();
 	static const std::map<CreatureQuantityId, std::string> creatureQuantityRanges;
 };