Bläddra i källkod

Fix build in debug mode

Ivan Savenko 2 år sedan
förälder
incheckning
37f3560b9c
5 ändrade filer med 5 tillägg och 6 borttagningar
  1. 2 2
      lib/ArtifactUtils.cpp
  2. 1 1
      lib/CArtHandler.cpp
  3. 1 1
      lib/CArtifactInstance.cpp
  4. 0 1
      lib/NetPacksLib.cpp
  5. 1 1
      lib/mapping/CMap.cpp

+ 2 - 2
lib/ArtifactUtils.cpp

@@ -125,7 +125,7 @@ DLL_LINKAGE std::vector<const CArtifact*> ArtifactUtils::assemblyPossibilities(
 
 	for(const auto artifact : art->getPartOf())
 	{
-		assert(artifact->constituents);
+		assert(artifact->isCombined());
 		bool possible = true;
 
 		for(const auto constituent : artifact->getConstituents()) //check if all constituents are available
@@ -171,7 +171,7 @@ DLL_LINKAGE CArtifactInstance * ArtifactUtils::createNewArtifactInstance(CArtifa
 	auto * artInst = new CArtifactInstance(art);
 	if(art->isCombined())
 	{
-		assert(art->constituents);
+		assert(art->isCombined());
 		for(const auto & part : art->getConstituents())
 			artInst->addPart(ArtifactUtils::createNewArtifactInstance(part), ArtifactPosition::PRE_FIRST);
 	}

+ 1 - 1
lib/CArtHandler.cpp

@@ -209,7 +209,7 @@ bool CArtifact::canBePutAt(const CArtifactSet * artSet, ArtifactPosition slot, b
 			fittingSet.artifactsWorn = artSet->artifactsWorn;
 			if(assumeDestRemoved)
 				fittingSet.removeArtifact(slot);
-			assert(constituents);
+
 			for(const auto art : constituents)
 			{
 				auto possibleSlot = ArtifactUtils::getArtAnyPosition(&fittingSet, art->getId());

+ 1 - 1
lib/CArtifactInstance.cpp

@@ -20,7 +20,7 @@ VCMI_LIB_NAMESPACE_BEGIN
 void CCombinedArtifactInstance::addPart(CArtifactInstance * art, const ArtifactPosition & slot)
 {
 	auto artInst = static_cast<CArtifactInstance*>(this);
-	assert(vstd::contains_if(*artInst->artType->constituents,
+	assert(vstd::contains_if(artInst->artType->getConstituents(),
 		[=](const CArtifact * partType)
 		{
 			return partType->getId() == art->getTypeId();

+ 0 - 1
lib/NetPacksLib.cpp

@@ -1530,7 +1530,6 @@ void NewArtifact::applyGs(CGameState *gs)
 	art->setType(art->artType);
 	if(art->isCombined())
 	{
-		assert(art->artType->getConstituents());
 		for(const auto & part : art->artType->getConstituents())
 			art->addPart(ArtifactUtils::createNewArtifactInstance(part), ArtifactPosition::PRE_FIRST);
 	}

+ 1 - 1
lib/mapping/CMap.cpp

@@ -473,7 +473,7 @@ void CMap::addNewArtifactInstance(CArtifactInstance * art)
 void CMap::eraseArtifactInstance(CArtifactInstance * art)
 {
 	//TODO: handle for artifacts removed in map editor
-	assert(artInstances[art->id.getNum()] == art);
+	assert(artInstances[art->getId().getNum()] == art);
 	artInstances[art->getId().getNum()].dellNull();
 }