From 4499f203a3ee9d6567b2af9011ee9e4378de0eab Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 1 Jul 2020 00:34:51 +0200 Subject: Core/DataStores: Fixed sending localized hotfixes and improved db2 loading error messages --- src/tools/vmap4_extractor/gameobject_extract.cpp | 8 ++++++-- src/tools/vmap4_extractor/vmapexport.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'src/tools/vmap4_extractor') diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp index db31a26bc06..7247398dd43 100644 --- a/src/tools/vmap4_extractor/gameobject_extract.cpp +++ b/src/tools/vmap4_extractor/gameobject_extract.cpp @@ -80,9 +80,13 @@ void ExtractGameobjectModels() DB2CascFileSource source(CascStorage, GameobjectDisplayInfoLoadInfo::Instance()->Meta->FileDataId); DB2FileLoader db2; - if (!db2.Load(&source, GameobjectDisplayInfoLoadInfo::Instance())) + try { - printf("Fatal error: Invalid GameObjectDisplayInfo.db2 file format!\n"); + db2.Load(&source, GameobjectDisplayInfoLoadInfo::Instance()); + } + catch (std::exception const& e) + { + printf("Fatal error: Invalid GameObjectDisplayInfo.db2 file format!\n%s\n", e.what()); exit(1); } diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 800819fa9af..3b4ac9aba25 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -478,9 +478,13 @@ int main(int argc, char ** argv) DB2CascFileSource source(CascStorage, MapLoadInfo::Instance()->Meta->FileDataId); DB2FileLoader db2; - if (!db2.Load(&source, MapLoadInfo::Instance())) + try { - printf("Fatal error: Invalid Map.db2 file format! %s\n", CASC::HumanReadableCASCError(GetLastError())); + db2.Load(&source, MapLoadInfo::Instance()); + } + catch (std::exception const& e) + { + printf("Fatal error: Invalid Map.db2 file format! %s\n%s\n", CASC::HumanReadableCASCError(GetLastError()), e.what()); exit(1); } -- cgit v1.2.3