Diagnostic improved.

OpenXRay · Nov 6, 2018 · 91d4f0d · 91d4f0d
1 parent b49e03a
commit 91d4f0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/xrCore/ModuleLookup.cpp b/src/xrCore/ModuleLookup.cpp
@@ -37,7 +37,7 @@ void* ModuleHandle::Open(pcstr moduleName)
 #ifdef WINDOWS
         Msg("! Failed to load DLL: 0x%d", GetLastError());
 #elif defined(LINUX)
-        Msg("! Failed to load DLL %s: %s", soName.c_str(), dlerror());
+        Msg("! Failed to load shared library %s: %s", soName.c_str(), dlerror());
 #endif
     }
 
@@ -62,7 +62,7 @@ void ModuleHandle::Close()
 #ifdef WINDOWS
         Msg("! Failed to close DLL: 0x%d", GetLastError());
 #elif defined(LINUX)
-        Msg("! Failed to close DLL: 0x%d", dlerror());
+        Msg("! Failed to close shared library: %s", dlerror());
 #endif
     }
 
@@ -94,7 +94,7 @@ void* ModuleHandle::GetProcAddress(pcstr procName) const
 #ifdef WINDOWS
         Msg("! Failed to load procedure [%s] from DLL: 0x%d", procName, GetLastError());
 #elif defined(LINUX)
-        Msg("! Failed to load procedure [%s] from DLL: 0x%d", procName, dlerror());
+        Msg("! Failed to load procedure [%s] from shared library: %s", procName, dlerror());
 #endif
     }
 

diff --git a/src/xrEngine/EngineAPI.cpp b/src/xrEngine/EngineAPI.cpp
@@ -143,7 +143,7 @@ void CEngineAPI::Initialize(void)
     InitializeRenderers();
 
     hGame = XRay::LoadModule("xrGame");
-    R_ASSERT2(hGame, "Game DLL raised exception during loading or there is no game DLL at all");
+    R_ASSERT2(hGame->IsLoaded(), "Game DLL raised exception during loading or there is no game DLL at all");
 
     pCreate = (Factory_Create*)hGame->GetProcAddress("xrFactory_Create");
     R_ASSERT(pCreate);