Make FPT a distinct type so we can hide it on tiles later

Author: Retera

core/src/com/etheller/warsmash/viewer5/handlers/mdx/EventObjectEmitterObject.java

@@ -117,15 +117,14 @@ public EventObjectEmitterObject(final MdxModel model, final MdlxEventObject even
 
 		final ModelViewer viewer = model.viewer;
 		final String name = eventObject.getName();
-		String type = name.substring(0, 3);
+		final String type = name.substring(0, 3);
 		final String id = name.substring(4);
 
 		// Same thing
 		if ("FPT".equals(type)) {
-			type = "SPL";
+			this.geometryEmitterType = GeometryEmitterFuncs.EMITTER_SPLAT;
 		}
-
-		if ("SPL".equals(type)) {
+		else if ("SPL".equals(type)) {
 			this.geometryEmitterType = GeometryEmitterFuncs.EMITTER_SPLAT;
 		}
 		else if ("UBR".equals(type)) {
@@ -156,6 +155,10 @@ else if ("SPL".equals(type)) {
 			tables.add(viewer.loadGeneric(pathSolver.solve("Splats\\SplatData.slk", solverParams).finalSrc,
 					FetchDataTypeName.SLK, mappedDataCallback));
 		}
+		else if ("FPT".equals(type)) {
+			tables.add(viewer.loadGeneric(pathSolver.solve("Splats\\SplatData.slk", solverParams).finalSrc,
+					FetchDataTypeName.SLK, mappedDataCallback));
+		}
 		else if ("UBR".equals(type)) {
 			tables.add(viewer.loadGeneric(pathSolver.solve("Splats\\UberSplatData.slk", solverParams).finalSrc,
 					FetchDataTypeName.SLK, mappedDataCallback));
@@ -229,7 +232,7 @@ private void load(final List<GenericResource> tables) {
 					this.ok = this.internalModel.ok;
 				}
 			}
-			else if ("SPL".equals(this.type) || "UBR".equals(this.type)) {
+			else if ("SPL".equals(this.type) || "FPT".equals(this.type) || "UBR".equals(this.type)) {
 				final String texturesExt = model.reforged ? ".dds" : ".blp";
 
 				this.internalTexture = (Texture) viewer.load(row.get("Dir") + "\\" + row.get("file") + texturesExt,
@@ -244,7 +247,7 @@ else if ("SPL".equals(this.type) || "UBR".equals(this.type)) {
 						{ getFloat(row, "EndR"), getFloat(row, "EndG"), getFloat(row, "EndB"),
 								getFloat(row, "EndA") } };
 
-				if ("SPL".equals(this.type)) {
+				if ("SPL".equals(this.type) || "FPT".equals(this.type)) {
 					this.columns = getInt(row, "Columns");
 					this.rows = getInt(row, "Rows");
 					this.lifeSpan = getFloat(row, "Lifespan") + getFloat(row, "Decay");

core/src/com/etheller/warsmash/viewer5/handlers/mdx/MdxComplexInstance.java

@@ -176,7 +176,7 @@ public void load() {
 			if ("SPN".equals(type)) {
 				emitter = new EventObjectSpnEmitter(this, emitterObject);
 			}
-			else if ("SPL".equals(type)) {
+			else if ("SPL".equals(type) || "FPT".equals(type)) {
 				emitter = new EventObjectSplEmitter(this, emitterObject);
 			}
 			else if ("UBR".equals(type)) {