build: fix variable shadowing in InGameUI message calls

bobtista · bobtista · commit f29def9acc08 · 2025-12-19T22:47:34.000-05:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -4858,15 +4858,15 @@ Int InGameUI::selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfM
 	if (numSelected == -1)
 	{
 		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		message( message );
+		this->message( message );
 	}
 	else if (numSelected == 0)
 	{
 	}
 	else
 	{
 		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossScreen" );
-		message( message );
+		this->message( message );
 	}
 	return numSelected;
 }
@@ -4892,15 +4892,15 @@ Int InGameUI::selectMatchingAcrossScreen( void )
 	if (numSelected == -1)
 	{
 		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		message( message );
+		this->message( message );
 	}
 	else if (numSelected == 0)
 	{
 	}
 	else
 	{
 		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossScreen" );
-		message( message );
+		this->message( message );
 	}
 	return numSelected;
 }
@@ -4913,21 +4913,21 @@ Int InGameUI::selectAllUnitsByTypeAcrossMap(KindOfMaskType mustBeSet, KindOfMask
 	if (numSelected == -1)
 	{
 		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		message( message );
+		this->message( message );
 	}
 	else if (numSelected == 0)
 	{
 		Drawable *draw = getFirstSelectedDrawable();
 		if( !draw || !draw->getObject() || !draw->getObject()->isKindOf( KINDOF_STRUCTURE ) )
 		{
 			UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-			message( message );
+			this->message( message );
 		}
 	}
 	else
 	{
 		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-		message( message );
+		this->message( message );
 	}
 	return numSelected;
 }
@@ -4942,21 +4942,21 @@ Int InGameUI::selectMatchingAcrossMap()
 	if (numSelected == -1)
 	{
 		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		message( message );
+		this->message( message );
 	}
 	else if (numSelected == 0)
 	{
 		Drawable *draw = getFirstSelectedDrawable();
 		if( !draw || !draw->getObject() || !draw->getObject()->isKindOf( KINDOF_STRUCTURE ) )
 		{
 			UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-			message( message );
+			this->message( message );
 		}
 	}
 	else
 	{
 		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-		message( message );
+		this->message( message );
 	}
 	return numSelected;
 }

Original file line number	Diff line number	Diff line change
`@@ -4858,15 +4858,15 @@ Int InGameUI::selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfM`
`4858`	`4858`	`if (numSelected == -1)`
`4859`	`4859`	`{`
`4860`	`4860`	`UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );`
`4861`		`- message( message );`
	`4861`	`+ this->message( message );`
`4862`	`4862`	`}`
`4863`	`4863`	`else if (numSelected == 0)`
`4864`	`4864`	`{`
`4865`	`4865`	`}`
`4866`	`4866`	`else`
`4867`	`4867`	`{`
`4868`	`4868`	`UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossScreen" );`
`4869`		`- message( message );`
	`4869`	`+ this->message( message );`
`4870`	`4870`	`}`
`4871`	`4871`	`return numSelected;`
`4872`	`4872`	`}`
`@@ -4892,15 +4892,15 @@ Int InGameUI::selectMatchingAcrossScreen( void )`
`4892`	`4892`	`if (numSelected == -1)`
`4893`	`4893`	`{`
`4894`	`4894`	`UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );`
`4895`		`- message( message );`
	`4895`	`+ this->message( message );`
`4896`	`4896`	`}`
`4897`	`4897`	`else if (numSelected == 0)`
`4898`	`4898`	`{`
`4899`	`4899`	`}`
`4900`	`4900`	`else`
`4901`	`4901`	`{`
`4902`	`4902`	`UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossScreen" );`
`4903`		`- message( message );`
	`4903`	`+ this->message( message );`
`4904`	`4904`	`}`
`4905`	`4905`	`return numSelected;`
`4906`	`4906`	`}`
`@@ -4913,21 +4913,21 @@ Int InGameUI::selectAllUnitsByTypeAcrossMap(KindOfMaskType mustBeSet, KindOfMask`
`4913`	`4913`	`if (numSelected == -1)`
`4914`	`4914`	`{`
`4915`	`4915`	`UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );`
`4916`		`- message( message );`
	`4916`	`+ this->message( message );`
`4917`	`4917`	`}`
`4918`	`4918`	`else if (numSelected == 0)`
`4919`	`4919`	`{`
`4920`	`4920`	`Drawable *draw = getFirstSelectedDrawable();`
`4921`	`4921`	`if( !draw \|\| !draw->getObject() \|\| !draw->getObject()->isKindOf( KINDOF_STRUCTURE ) )`
`4922`	`4922`	`{`
`4923`	`4923`	`UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );`
`4924`		`- message( message );`
	`4924`	`+ this->message( message );`
`4925`	`4925`	`}`
`4926`	`4926`	`}`
`4927`	`4927`	`else`
`4928`	`4928`	`{`
`4929`	`4929`	`UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );`
`4930`		`- message( message );`
	`4930`	`+ this->message( message );`
`4931`	`4931`	`}`
`4932`	`4932`	`return numSelected;`
`4933`	`4933`	`}`
`@@ -4942,21 +4942,21 @@ Int InGameUI::selectMatchingAcrossMap()`
`4942`	`4942`	`if (numSelected == -1)`
`4943`	`4943`	`{`
`4944`	`4944`	`UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );`
`4945`		`- message( message );`
	`4945`	`+ this->message( message );`
`4946`	`4946`	`}`
`4947`	`4947`	`else if (numSelected == 0)`
`4948`	`4948`	`{`
`4949`	`4949`	`Drawable *draw = getFirstSelectedDrawable();`
`4950`	`4950`	`if( !draw \|\| !draw->getObject() \|\| !draw->getObject()->isKindOf( KINDOF_STRUCTURE ) )`
`4951`	`4951`	`{`
`4952`	`4952`	`UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );`
`4953`		`- message( message );`
	`4953`	`+ this->message( message );`
`4954`	`4954`	`}`
`4955`	`4955`	`}`
`4956`	`4956`	`else`
`4957`	`4957`	`{`
`4958`	`4958`	`UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );`
`4959`		`- message( message );`
	`4959`	`+ this->message( message );`
`4960`	`4960`	`}`
`4961`	`4961`	`return numSelected;`
`4962`	`4962`	`}`