From 04d15174e70f79d245000326df113be969f3cd89 Mon Sep 17 00:00:00 2001 From: ArseniyShestakov Date: Thu, 25 Dec 2014 17:18:37 +0300 Subject: [PATCH] Use switch for CArtHandler::isTradableArtifact --- lib/CArtHandler.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/CArtHandler.cpp b/lib/CArtHandler.cpp index 378d1e738..84f821160 100644 --- a/lib/CArtHandler.cpp +++ b/lib/CArtHandler.cpp @@ -585,10 +585,18 @@ bool CArtHandler::legalArtifact(ArtifactID id) bool CArtHandler::isTradableArtifact(ArtifactID id) const { - if (id < 7 && id != ArtifactID::SPELL_SCROLL) + switch (id) + { + case ArtifactID::SPELLBOOK: + case ArtifactID::GRAIL: + case ArtifactID::CATAPULT: + case ArtifactID::BALLISTA: + case ArtifactID::AMMO_CART: + case ArtifactID::FIRST_AID_TENT: return false; - - return true; + default: + return true; + } } void CArtHandler::initAllowedArtifactsList(const std::vector &allowed)