bugfix(input): Prevent invalid interaction feedback for sabotage attempts against sold or under construction buildings (#1459)

Stubbjax · web-flow · commit 0c2375eebe09 · 2025-08-18T18:46:22.000+02:00
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageCommandCenterCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageCommandCenterCrateCollide.cpp
@@ -97,6 +97,12 @@ Bool SabotageCommandCenterCrateCollide::isValidToExecute( const Object *other )
 		return FALSE;
 	}
 
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageFakeBuilding.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageFakeBuilding.cpp
@@ -92,6 +92,12 @@ Bool SabotageFakeBuildingCrateCollide::isValidToExecute( const Object *other ) c
 		return FALSE;
 	}
 
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageInternetCenterCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageInternetCenterCrateCollide.cpp
@@ -98,6 +98,12 @@ Bool SabotageInternetCenterCrateCollide::isValidToExecute( const Object *other )
 		return FALSE;
 	}
 
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageMilitaryFactoryCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageMilitaryFactoryCrateCollide.cpp
@@ -102,6 +102,12 @@ Bool SabotageMilitaryFactoryCrateCollide::isValidToExecute( const Object *other
 		return FALSE;
 	}
 
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotagePowerPlantCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotagePowerPlantCrateCollide.cpp
@@ -92,6 +92,12 @@ Bool SabotagePowerPlantCrateCollide::isValidToExecute( const Object *other ) con
 		return FALSE;
 	}
 
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSuperweaponCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSuperweaponCrateCollide.cpp
@@ -97,6 +97,12 @@ Bool SabotageSuperweaponCrateCollide::isValidToExecute( const Object *other ) co
 		return FALSE;
 	}
 
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyCenterCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyCenterCrateCollide.cpp
@@ -96,6 +96,12 @@ Bool SabotageSupplyCenterCrateCollide::isValidToExecute( const Object *other ) c
 		return FALSE;
 	}
 
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyDropzoneCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyDropzoneCrateCollide.cpp
@@ -96,6 +96,12 @@ Bool SabotageSupplyDropzoneCrateCollide::isValidToExecute( const Object *other )
 		return FALSE;
 	}
 
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,12 @@ Bool SabotageCommandCenterCrateCollide::isValidToExecute( const Object *other )`
`97`	`97`	`return FALSE;`
`98`	`98`	`}`
`99`	`99`
	`100`	`+ if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
	`101`	`+ {`
	`102`	`+ // TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
	`103`	`+ return FALSE;`
	`104`	`+ }`
	`105`	`+`
`100`	`106`	`Relationship r = getObject()->getRelationship( other );`
`101`	`107`	`if( r != ENEMIES )`
`102`	`108`	`{`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,12 @@ Bool SabotageFakeBuildingCrateCollide::isValidToExecute( const Object *other ) c`
`92`	`92`	`return FALSE;`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
	`96`	`+ {`
	`97`	`+ // TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
	`98`	`+ return FALSE;`
	`99`	`+ }`
	`100`	`+`
`95`	`101`	`Relationship r = getObject()->getRelationship( other );`
`96`	`102`	`if( r != ENEMIES )`
`97`	`103`	`{`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,12 @@ Bool SabotageInternetCenterCrateCollide::isValidToExecute( const Object *other )`
`98`	`98`	`return FALSE;`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
	`102`	`+ {`
	`103`	`+ // TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
	`104`	`+ return FALSE;`
	`105`	`+ }`
	`106`	`+`
`101`	`107`	`Relationship r = getObject()->getRelationship( other );`
`102`	`108`	`if( r != ENEMIES )`
`103`	`109`	`{`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,12 @@ Bool SabotageMilitaryFactoryCrateCollide::isValidToExecute( const Object *other`
`102`	`102`	`return FALSE;`
`103`	`103`	`}`
`104`	`104`
	`105`	`+ if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
	`106`	`+ {`
	`107`	`+ // TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
	`108`	`+ return FALSE;`
	`109`	`+ }`
	`110`	`+`
`105`	`111`	`Relationship r = getObject()->getRelationship( other );`
`106`	`112`	`if( r != ENEMIES )`
`107`	`113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,12 @@ Bool SabotagePowerPlantCrateCollide::isValidToExecute( const Object *other ) con`
`92`	`92`	`return FALSE;`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
	`96`	`+ {`
	`97`	`+ // TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
	`98`	`+ return FALSE;`
	`99`	`+ }`
	`100`	`+`
`95`	`101`	`Relationship r = getObject()->getRelationship( other );`
`96`	`102`	`if( r != ENEMIES )`
`97`	`103`	`{`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,12 @@ Bool SabotageSuperweaponCrateCollide::isValidToExecute( const Object *other ) co`
`97`	`97`	`return FALSE;`
`98`	`98`	`}`
`99`	`99`
	`100`	`+ if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
	`101`	`+ {`
	`102`	`+ // TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
	`103`	`+ return FALSE;`
	`104`	`+ }`
	`105`	`+`
`100`	`106`	`Relationship r = getObject()->getRelationship( other );`
`101`	`107`	`if( r != ENEMIES )`
`102`	`108`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,12 @@ Bool SabotageSupplyCenterCrateCollide::isValidToExecute( const Object *other ) c`
`96`	`96`	`return FALSE;`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
	`100`	`+ {`
	`101`	`+ // TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
	`102`	`+ return FALSE;`
	`103`	`+ }`
	`104`	`+`
`99`	`105`	`Relationship r = getObject()->getRelationship( other );`
`100`	`106`	`if( r != ENEMIES )`
`101`	`107`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,12 @@ Bool SabotageSupplyDropzoneCrateCollide::isValidToExecute( const Object *other )`
`96`	`96`	`return FALSE;`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
	`100`	`+ {`
	`101`	`+ // TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
	`102`	`+ return FALSE;`
	`103`	`+ }`
	`104`	`+`
`99`	`105`	`Relationship r = getObject()->getRelationship( other );`
`100`	`106`	`if( r != ENEMIES )`
`101`	`107`	`{`