Merge pull request #624 from FedericoMilesi/EVENT_ResolveSFXMarker

[EVENT]: Implement EVENT_ResolveSFXMarker
Gh0stBlade · Feb 1, 2024 · b51990e · b51990e
2 parents 973c9c2 + b726000
commit b51990e
Showing 1 changed file with 19 additions and 30 deletions.
diff --git a/KAIN2/Game/EVENT.C b/KAIN2/Game/EVENT.C
@@ -765,37 +765,26 @@ struct Intro* EVENT_ResolveObjectIntro(struct EventInstanceObject* instanceObjec
 }
 
 
-// autogenerated function stub: 
-// struct _SFXMkr * /*$ra*/ EVENT_ResolveSFXMarker(struct _StreamUnit *stream /*$a0*/, struct EventInstanceObject *instanceObject /*$a1*/)
-struct _SFXMkr * EVENT_ResolveSFXMarker(struct _StreamUnit *stream, struct EventInstanceObject *instanceObject)
-{ // line 1123, offset 0x80061898
-	/* begin block 1 */
-		// Start line: 1125
-		// Start offset: 0x80061898
-		// Variables:
-			int i; // $a0
-			struct Level *level; // $t0
-			struct _SFXMkr *result; // $a2
-	/* end block 1 */
-	// End offset: 0x800618F0
-	// End Line: 1143
-
-	/* begin block 2 */
-		// Start line: 2617
-	/* end block 2 */
-	// End Line: 2618
-
-	/* begin block 3 */
-		// Start line: 2618
-	/* end block 3 */
-	// End Line: 2619
+struct _SFXMkr* EVENT_ResolveSFXMarker(struct _StreamUnit* stream, struct EventInstanceObject* instanceObject)  // Matching - 100%
+{
+	int i;
+	struct Level* level;
+	struct _SFXMkr* result;
 
-	/* begin block 4 */
-		// Start line: 2622
-	/* end block 4 */
-	// End Line: 2623
-			UNIMPLEMENTED();
-	return null;
+	level = stream->level;
+	result = NULL;
+	if (level->NumberOfSFXMarkers != NULL)
+	{
+		for (i = 0; i < level->NumberOfSFXMarkers; i++)
+		{
+			if (instanceObject->introUniqueID == level->SFXMarkerList[i].uniqueID)
+			{
+				result = &level->SFXMarkerList[i];
+				break;
+			}
+		}
+	}
+	return result;
 }
 
 void EVENT_AddGameObjectToStack(struct _PCodeStack* stack) // Matching - 100%