From 10ad5b67890889aa4912b304c3c2efc16a993d61 Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Fri, 27 Oct 2023 17:16:27 +0000 Subject: [PATCH] client/windows/CCastleInterface.cpp: Identical sub-expressions on both sides of operator "&&". Identical expressions should not be used on both sides of a binary operator --- client/windows/CCastleInterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/windows/CCastleInterface.cpp b/client/windows/CCastleInterface.cpp index 84c1ccd05..a0bc94cc8 100644 --- a/client/windows/CCastleInterface.cpp +++ b/client/windows/CCastleInterface.cpp @@ -969,9 +969,9 @@ void CCastleBuildings::enterMagesGuild() { const StartInfo *si = LOCPLINT->cb->getStartInfo(); // it would be nice to find a way to move this hack to config/mapOverrides.json - if(si && si->campState && si->campState && // We're in campaign, + if(si && si->campState && // We're in campaign, (si->campState->getFilename() == "DATA/YOG.H3C") && // which is "Birth of a Barbarian", - (hero->subID == 45)) // and the hero is Yog (based on Solmyr) + (hero->subID == 45)) // and the hero is Yog (based on Solmyr) { // "Yog has given up magic in all its forms..." LOCPLINT->showInfoDialog(CGI->generaltexth->allTexts[736]);