Fix GeneralsMD ReadParameterJSON to use KindOfMaskType::getBitNames() instead of TheKindOf

Author: bobtista

GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp

@@ -2562,46 +2562,65 @@ Parameter *Parameter::ReadParameterJSON(JSONChunkInput &file)
 
 	if (pParm->getParameterType() == KIND_OF_PARAM)
 	{
-		Bool found = false;
-		const char* const* kindofNames = TheKindOf->getKindOfNames();
-		Int i;
-		for( i = 0; kindofNames[i]; ++i )
-		{
-			if (pParm->m_string.compareNoCase(kindofNames[i]) == 0)
-			{
-				pParm->setInt(i);
-				found = true;
-				break;
-			}
-		}
-		if (!found)
+		const char* const* kindofNames = KindOfMaskType::getBitNames();
+		if (!pParm->m_string.isEmpty())
 		{
-			if (pParm->m_string.compareNoCase("MISSILE") == 0)
+			Bool found = false;
+			for (int i = 0; kindofNames[i]; ++i)
 			{
-				pParm->m_string.format( "SMALL_MISSILE" );
-				for( i = 0; kindofNames[i]; ++i )
+				if (pParm->m_string.compareNoCase(kindofNames[i]) == 0)
+				{
+					pParm->setInt(i);
+					found = true;
+					break;
+				}
+				if( !pParm->m_string.compareNoCase( "CRUSHER" ) )
+				{
+					pParm->setInt(i);
+					found = true;
+					DEBUG_CRASH(( "Kindof CRUSHER no longer exists -- in order to get your map to load, it has been switched to OBSTACLE, please call Kris (x36844).", pParm->m_string.str()));
+					break;
+				}
+				else if( !pParm->m_string.compareNoCase( "CRUSHABLE" ) )
+				{
+					pParm->setInt(i);
+					found = true;
+					DEBUG_CRASH(( "Kindof CRUSHABLE no longer exists -- in order to get your map to load, it has been switched to OBSTACLE, please call Kris (x36844).", pParm->m_string.str()));
+					break;
+				}
+				else if( !pParm->m_string.compareNoCase( "OVERLAPPABLE" ) )
+				{
+					pParm->setInt(i);
+					found = true;
+					DEBUG_CRASH(( "Kindof OVERLAPPABLE no longer exists -- in order to get your map to load, it has been switched to OBSTACLE, please call Kris (x36844).", pParm->m_string.str()));
+					break;
+				}
+				else if( !pParm->m_string.compareNoCase( "MISSILE" ) )
 				{
-					if (pParm->m_string.compareNoCase("SMALL_MISSILE") == 0)
+					pParm->m_string.format( "SMALL_MISSILE" );
+					for( i = 0; kindofNames[i]; ++i )
 					{
-						pParm->setInt(i);
-						found = true;
-						break;
+						if (pParm->m_string.compareNoCase("SMALL_MISSILE") == 0)
+						{
+							pParm->setInt(i);
+							found = true;
+							break;
+						}
 					}
+					DEBUG_CRASH(("Unable to find Kindof SMALL_MISSILE, please call KrisM (x36844)."));
 				}
-				DEBUG_CRASH(("Unable to find Kindof SMALL_MISSILE, please call KrisM (x36844)."));
+			}
+			if (!found)
+			{
+				DEBUG_CRASH(("Unable to find Kindof '%s', please call JKM (x36872).", pParm->m_string.str()));
+				throw ERROR_BUG;
 			}
 		}
-		if (!found)
+		else
 		{
-			DEBUG_CRASH(("Unable to find Kindof '%s', please call JKM (x36872).", pParm->m_string.str()));
-			throw ERROR_BUG;
+			pParm->m_string = kindofNames[pParm->m_int];
 		}
 	}
-	else
-	{
-		const char* const* kindofNames = TheKindOf->getKindOfNames();
-		pParm->m_string = kindofNames[pParm->m_int];
-	}
 
 	return pParm;
 }