From 86e59ab073f2567c540e8d0bd6371b10fe7fe8e2 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Tue, 10 Jun 2025 18:08:42 +0200 Subject: [PATCH] Fixed bug in logical AND / OR expression. --- GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp index d0495081611..4506da46f28 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp @@ -115,9 +115,9 @@ void AcademyStats::init( const Player *player ) const PlayerTemplate *plyrTemplate = player->getPlayerTemplate(); if( !plyrTemplate || - plyrTemplate->getBaseSide().compareNoCase( "USA" ) && + ( plyrTemplate->getBaseSide().compareNoCase( "USA" ) && plyrTemplate->getBaseSide().compareNoCase( "China" ) && - plyrTemplate->getBaseSide().compareNoCase( "GLA" ) ) + plyrTemplate->getBaseSide().compareNoCase( "GLA" ) ) ) { //Admittedly, this is a massive violation of data driven design. Shame on me! //Unknown side... don't provide ANY advice. Simplicity reasons.