Fix Generals Scripts: add missing ParseActionDataChunkJSON declaration, fix TheKindOf usage, remove duplicate function, wrap JSON parser registrations

Author: bobtista

Generals/Code/GameEngine/Include/GameLogic/Scripts.h

@@ -596,10 +596,13 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 	static void WriteActionDataChunkJSON(JSONChunkOutput &chunkWriter, ScriptAction *pAct);
 #endif
 	static Bool ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
+#ifdef RTS_HAS_JSON_CHUNK
+	static Bool ParseActionDataChunkJSON(JSONChunkInput &file, JSONChunkInfo *info, void *userData);
+#endif
 	static void WriteActionFalseDataChunk(DataChunkOutput &chunkWriter, ScriptAction *pAct);
 #ifdef RTS_HAS_JSON_CHUNK
 	static void WriteActionFalseDataChunkJSON(JSONChunkOutput &chunkWriter, ScriptAction *pAct);
-	static Bool ParseActionFalseDataChunkJSON(DataChunkInput &file, DataChunkInfo *info, void *userData);
+	static Bool ParseActionFalseDataChunkJSON(JSONChunkInput &file, JSONChunkInfo *info, void *userData);
 #endif
 	static Bool ParseActionFalseDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
 

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

@@ -1395,9 +1395,11 @@ Script *Script::ParseScriptJSON(JSONChunkInput &file, unsigned short version)
 	if (version>=K_SCRIPT_DATA_VERSION_2) {
 		pScript->m_delayEvaluationSeconds = file.readInt();
 	}
+#ifdef RTS_HAS_JSON_CHUNK
 	file.registerParser( "OrCondition", "Script", OrCondition::ParseOrConditionDataChunkJSON );
 	file.registerParser( "ScriptAction",  "Script", ScriptAction::ParseActionDataChunkJSON );
 	file.registerParser( "ScriptActionFalse",  "Script", ScriptAction::ParseActionFalseDataChunkJSON );
+#endif
 	if (! file.parse(pScript) )
 	{
 		return NULL;
@@ -2488,7 +2490,7 @@ Parameter *Parameter::ReadParameterJSON(JSONChunkInput &file)
 	if (pParm->getParameterType() == KIND_OF_PARAM)
 	{
 		Bool found = false;
-		const char* const* kindofNames = TheKindOf->getKindOfNames();
+		const char* const* kindofNames = KindOfMaskType::getBitNames();
 		Int i;
 		for( i = 0; kindofNames[i]; ++i )
 		{
@@ -2524,7 +2526,7 @@ Parameter *Parameter::ReadParameterJSON(JSONChunkInput &file)
 	}
 	else
 	{
-		const char* const* kindofNames = TheKindOf->getKindOfNames();
+		const char* const* kindofNames = KindOfMaskType::getBitNames();
 		pParm->m_string = kindofNames[pParm->m_int];
 	}
 
@@ -2921,33 +2923,6 @@ Bool ScriptAction::ParseActionFalseDataChunkJSON(JSONChunkInput &file, JSONChunk
 }
 #endif
 
-#ifdef RTS_HAS_JSON_CHUNK
-Bool ScriptAction::ParseActionFalseDataChunkJSON(JSONChunkInput &file, JSONChunkInfo *info, void *userData)
-{
-	Script *pScript = (Script *)userData;
-
-	ScriptAction	*pScriptAction = newInstance(ScriptAction);
-
-	pScriptAction->m_actionType = (enum ScriptActionType)file.readInt();
-	pScriptAction->m_numParms =file.readInt();
-	Int i;
-	for (i=0; i<pScriptAction->m_numParms; i++) {
-		pScriptAction->m_parms[i] = Parameter::ReadParameterJSON(file);
-	}
-	ScriptAction *pLast = pScript->getFalseAction();
-	while (pLast && pLast->getNext()) {
-		pLast = pLast->getNext();
-	}
-	if (pLast) {
-		pLast->setNextAction(pScriptAction);
-	} else {
-		pScript->setFalseAction(pScriptAction);
-	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
-	return true;
-}
-#endif
-
 // NOTE: Changing these or adding to TheObjectFlagsNames requires changes to
 // ScriptActions::changeObjectPanelFlagForSingleObject
 // THEY SHOULD STAY IN SYNC.