From e814515b53dd92c2be53e6e72f2fd1d41e5e4ee2 Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Fri, 20 Sep 2024 19:39:26 +0200
Subject: [PATCH] fix: failure to load xmodel does not abort loading process

---
 src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.cpp | 5 +++++
 src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.cpp  | 5 +++++
 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp  | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.cpp b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.cpp
index c4689b39..4f7f9629 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.cpp
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.cpp
@@ -34,9 +34,14 @@ bool AssetLoaderXModel::LoadFromRaw(
 
     std::vector<XAssetInfoGeneric*> dependencies;
     if (LoadXModel(*file.m_stream, *xmodel, memory, manager, dependencies))
+    {
         manager->AddAsset<AssetXModel>(assetName, xmodel, std::move(dependencies));
+    }
     else
+    {
         std::cerr << std::format("Failed to load xmodel \"{}\"\n", assetName);
+        return false;
+    }
 
     return true;
 }
diff --git a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.cpp b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.cpp
index d419ce67..22dee30f 100644
--- a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.cpp
+++ b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.cpp
@@ -34,9 +34,14 @@ bool AssetLoaderXModel::LoadFromRaw(
 
     std::vector<XAssetInfoGeneric*> dependencies;
     if (LoadXModel(*file.m_stream, *xmodel, memory, manager, dependencies))
+    {
         manager->AddAsset<AssetXModel>(assetName, xmodel, std::move(dependencies));
+    }
     else
+    {
         std::cerr << std::format("Failed to load xmodel \"{}\"\n", assetName);
+        return false;
+    }
 
     return true;
 }
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp
index 2c1ff6f1..28dfcc01 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp
@@ -34,9 +34,14 @@ bool AssetLoaderXModel::LoadFromRaw(
 
     std::vector<XAssetInfoGeneric*> dependencies;
     if (LoadXModel(*file.m_stream, *xmodel, memory, manager, dependencies))
+    {
         manager->AddAsset<AssetXModel>(assetName, xmodel, std::move(dependencies));
+    }
     else
+    {
         std::cerr << std::format("Failed to load xmodel \"{}\"\n", assetName);
+        return false;
+    }
 
     return true;
 }