1 files changed, 7 insertions, 11 deletions
diff --git a/MagicEx/src/mag2obj.cpp b/MagicEx/src/mag2obj.cpp
index a8ba386..1439ac7 100644
--- a/MagicEx/src/mag2obj.cpp
+++ b/MagicEx/src/mag2obj.cpp
@@ -4,24 +4,20 @@
     Copyright (c) 1997-2006, Destroyer Studios LLC.
 */
 
-#include <memory>
+#include <string>
 
-#include <Solid.h>
-
-#include <MagicLoad.h>
 #include <ModelFileMAG.h>
 #include <ModelFileOBJ.h>
 
+#include "convert.h"
+
 
 int
 main(int argc, char* argv[])
 {
 	if (argc < 2)
-		return 1;
-	std::string pathname {argv[1]};
-	auto solid = std::make_unique<Solid>();
-	if (!ImportInto<ModelFileMAG>(pathname.c_str(), solid.get()))
-		return 1;
-	ModelFileOBJ exporter {(pathname + ".obj").c_str()};
-	exporter.Save(solid->GetModel());
+		return 2;
+	const std::string input {argv[1]};
+	const auto output = input + ".obj";
+	return starshatter::convert<ModelFileMAG, ModelFileOBJ>(input, output);
 }