Merge pull request #2957 from ProjectMutilation/fix-pvs-issues

Fixed some issues found by pvs

AI/Nullkiller/AIGateway.cpp

@@ -702,8 +702,8 @@ void AIGateway::showGarrisonDialog(const CArmedInstance * up, const CGHeroInstan
 	LOG_TRACE_PARAMS(logAi, "removableUnits '%i', queryID '%i'", removableUnits % queryID);
 	NET_EVENT_HANDLER;
 
-	std::string s1 = up ? up->nodeName() : "NONE";
-	std::string s2 = down ? down->nodeName() : "NONE";
+	std::string s1 = up->nodeName();
+	std::string s2 = down->nodeName();
 
 	status.addQuery(queryID, boost::str(boost::format("Garrison dialog with %s and %s") % s1 % s2));
 
@@ -711,7 +711,9 @@ void AIGateway::showGarrisonDialog(const CArmedInstance * up, const CGHeroInstan
 	requestActionASAP([=]()
 	{
 		if(removableUnits && up->tempOwner == down->tempOwner)
+		{
 			pickBestCreatures(down, up);
+		}
 
 		answerQuery(queryID, 0);
 	});

AI/VCAI/Goals/CollectRes.cpp

@@ -60,14 +60,11 @@ TGoalVec CollectRes::getAllPossibleSubgoals()
 				return false;
 			}
 			break;
-		case Obj::WATER_WHEEL:
-			if (resID != GameResID(EGameResID::GOLD))
-				return false;
-			break;
 		case Obj::MYSTICAL_GARDEN:
 			if ((resID != GameResID(EGameResID::GOLD)) && (resID != GameResID(EGameResID::GEMS)))
 				return false;
 			break;
+		case Obj::WATER_WHEEL:
 		case Obj::LEAN_TO:
 		case Obj::WAGON:
 			if (resID != GameResID(EGameResID::GOLD))

client/render/ColorFilter.cpp

@@ -138,7 +138,7 @@ ColorFilter ColorFilter::genFromJson(const JsonNode & entry)
 		r.a = entry["red"].Vector()[3].Float();
 	}
 
-	if (!entry["red"].isNull())
+	if (!entry["green"].isNull())
 	{
 		g.r = entry["green"].Vector()[0].Float();
 		g.g = entry["green"].Vector()[1].Float();
@@ -146,7 +146,7 @@ ColorFilter ColorFilter::genFromJson(const JsonNode & entry)
 		g.a = entry["green"].Vector()[3].Float();
 	}
 
-	if (!entry["red"].isNull())
+	if (!entry["blue"].isNull())
 	{
 		b.r = entry["blue"].Vector()[0].Float();
 		b.g = entry["blue"].Vector()[1].Float();

lib/ArtifactUtils.cpp

@@ -87,10 +87,9 @@ DLL_LINKAGE bool ArtifactUtils::checkSpellbookIsNeeded(const CGHeroInstance * he
 	// Titan's Thunder creates new spellbook on equip
 	if(artID == ArtifactID::TITANS_THUNDER && slot == ArtifactPosition::RIGHT_HAND)
 	{
-		if(heroPtr)
+		if(heroPtr && !heroPtr->hasSpellbook())
 		{
-			if(heroPtr && !heroPtr->hasSpellbook())
-				return true;
+			return true;
 		}
 	}
 	return false;