Improved 'canSnipeVehicle' logic by excluding empty bikes.

Caball009 · Caball009 · commit b8d95a40adcd · 2025-09-04T20:50:08.000+02:00
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp
@@ -1431,6 +1431,13 @@ Bool ActionManager::canSnipeVehicle( const Object *obj, const Object *objectToSn
 			return FALSE;
 		}
 
+		// TheSuperHackers @bugfix Caball009 04/09/2025 Disabled bikes may not have a rider to snipe.
+		ContainModuleInterface* contain = objectToSnipe->getContain();
+		if ( contain && contain->isRiderChangeContain() && contain->getContainedItemsList()->empty() )
+		{
+			return FALSE;
+		}
+
 		return TRUE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1431,6 +1431,13 @@ Bool ActionManager::canSnipeVehicle( const Object obj, const Object objectToSn`
`1431`	`1431`	`return FALSE;`
`1432`	`1432`	`}`
`1433`	`1433`
	`1434`	`+ // TheSuperHackers @bugfix Caball009 04/09/2025 Disabled bikes may not have a rider to snipe.`
	`1435`	`+ ContainModuleInterface* contain = objectToSnipe->getContain();`
	`1436`	`+ if ( contain && contain->isRiderChangeContain() && contain->getContainedItemsList()->empty() )`
	`1437`	`+ {`
	`1438`	`+ return FALSE;`
	`1439`	`+ }`
	`1440`	`+`
`1434`	`1441`	`return TRUE;`
`1435`	`1442`	`}`
`1436`	`1443`