Shared Gen/ZH changes.

Caball009 · Caball009 · commit 2e3ede155ade · 2025-07-10T16:47:35.000+02:00
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp
@@ -174,7 +174,7 @@ Int ScoreKeeper::getTotalObjectsBuilt( const ThingTemplate *pTemplate )
 	for (ObjectCountMapIt it = m_objectsBuilt.begin(); it != m_objectsBuilt.end(); ++it)
 	{
 		const ThingTemplate *theTemplate = it->first;
-		if (theTemplate->isEquivalentTo(pTemplate))
+		if (theTemplate && theTemplate->isEquivalentTo(pTemplate))
 			++count;
 	}
 	return count;
diff --git a/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp b/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp
@@ -1218,9 +1218,8 @@ Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate
 		// get this button
 		commandButton = commandSet->getCommandButton(i);
 		if( commandButton &&
-				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD ||
-				 commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
-				commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
+				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD || commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
+				commandButton->getThingTemplate() && commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
 			foundCommand = commandButton;
 
 	}  // end for i
diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
@@ -1319,7 +1319,7 @@ const AudioEventRTS *ThingTemplate::getPerUnitSound(const AsciiString& soundName
 Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const
 {
 	// sanity
-	if (!(this && tt)) 
+	if (!tt)
 		return false;
 
 	// sanity
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
@@ -1738,7 +1738,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					if (beacon)
 					{
 						const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );
-						if (thing->isEquivalentTo(beacon->getTemplate()))
+						if (thing && thing->isEquivalentTo(beacon->getTemplate()))
 						{
 							if (beacon->getControllingPlayer() == thisPlayer)
 							{
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp
@@ -174,7 +174,7 @@ Int ScoreKeeper::getTotalObjectsBuilt( const ThingTemplate *pTemplate )
 	for (ObjectCountMapIt it = m_objectsBuilt.begin(); it != m_objectsBuilt.end(); ++it)
 	{
 		const ThingTemplate *theTemplate = it->first;
-		if (theTemplate->isEquivalentTo(pTemplate))
+		if (theTemplate && theTemplate->isEquivalentTo(pTemplate))
 			++count;
 	}
 	return count;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp
@@ -1271,9 +1271,8 @@ Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate
 		// get this button
 		commandButton = commandSet->getCommandButton(i);
 		if( commandButton &&
-				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD ||
-				 commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
-				commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
+				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD || commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
+				commandButton->getThingTemplate() && commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
 			foundCommand = commandButton;
 
 	}  // end for i
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
@@ -1474,7 +1474,7 @@ UnsignedInt ThingTemplate::getMaxSimultaneousOfType() const
 Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const
 {
 	// sanity
-	if (!(this && tt)) 
+	if (!tt)
 		return false;
 
 	// sanity
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
@@ -1766,7 +1766,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					if (beacon)
 					{
 						const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );
-						if (thing->isEquivalentTo(beacon->getTemplate()))
+						if (thing && thing->isEquivalentTo(beacon->getTemplate()))
 						{
 							if (beacon->getControllingPlayer() == thisPlayer)
 							{

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ Int ScoreKeeper::getTotalObjectsBuilt( const ThingTemplate *pTemplate )`
`174`	`174`	`for (ObjectCountMapIt it = m_objectsBuilt.begin(); it != m_objectsBuilt.end(); ++it)`
`175`	`175`	`{`
`176`	`176`	`const ThingTemplate *theTemplate = it->first;`
`177`		`- if (theTemplate->isEquivalentTo(pTemplate))`
	`177`	`+ if (theTemplate && theTemplate->isEquivalentTo(pTemplate))`
`178`	`178`	`++count;`
`179`	`179`	`}`
`180`	`180`	`return count;`
Original file line number	Diff line number	Diff line change
`@@ -1319,7 +1319,7 @@ const AudioEventRTS *ThingTemplate::getPerUnitSound(const AsciiString& soundName`
`1319`	`1319`	`Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const`
`1320`	`1320`	`{`
`1321`	`1321`	`// sanity`
`1322`		`- if (!(this && tt))`
	`1322`	`+ if (!tt)`
`1323`	`1323`	`return false;`
`1324`	`1324`
`1325`	`1325`	`// sanity`
Original file line number	Diff line number	Diff line change
`@@ -1738,7 +1738,7 @@ void GameLogic::logicMessageDispatcher( GameMessage msg, void userData )`
`1738`	`1738`	`if (beacon)`
`1739`	`1739`	`{`
`1740`	`1740`	`const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );`
`1741`		`- if (thing->isEquivalentTo(beacon->getTemplate()))`
	`1741`	`+ if (thing && thing->isEquivalentTo(beacon->getTemplate()))`
`1742`	`1742`	`{`
`1743`	`1743`	`if (beacon->getControllingPlayer() == thisPlayer)`
`1744`	`1744`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1474,7 +1474,7 @@ UnsignedInt ThingTemplate::getMaxSimultaneousOfType() const`
`1474`	`1474`	`Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const`
`1475`	`1475`	`{`
`1476`	`1476`	`// sanity`
`1477`		`- if (!(this && tt))`
	`1477`	`+ if (!tt)`
`1478`	`1478`	`return false;`
`1479`	`1479`
`1480`	`1480`	`// sanity`
Original file line number	Diff line number	Diff line change
`@@ -1766,7 +1766,7 @@ void GameLogic::logicMessageDispatcher( GameMessage msg, void userData )`
`1766`	`1766`	`if (beacon)`
`1767`	`1767`	`{`
`1768`	`1768`	`const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );`
`1769`		`- if (thing->isEquivalentTo(beacon->getTemplate()))`
	`1769`	`+ if (thing && thing->isEquivalentTo(beacon->getTemplate()))`
`1770`	`1770`	`{`
`1771`	`1771`	`if (beacon->getControllingPlayer() == thisPlayer)`
`1772`	`1772`	`{`