Skip to content

Commit 91d4f0d

Browse files
drug007eagleivg
authored andcommitted
Diagnostic improved.
1 parent b49e03a commit 91d4f0d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/xrCore/ModuleLookup.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void* ModuleHandle::Open(pcstr moduleName)
3737
#ifdef WINDOWS
3838
Msg("! Failed to load DLL: 0x%d", GetLastError());
3939
#elif defined(LINUX)
40-
Msg("! Failed to load DLL %s: %s", soName.c_str(), dlerror());
40+
Msg("! Failed to load shared library %s: %s", soName.c_str(), dlerror());
4141
#endif
4242
}
4343

@@ -62,7 +62,7 @@ void ModuleHandle::Close()
6262
#ifdef WINDOWS
6363
Msg("! Failed to close DLL: 0x%d", GetLastError());
6464
#elif defined(LINUX)
65-
Msg("! Failed to close DLL: 0x%d", dlerror());
65+
Msg("! Failed to close shared library: %s", dlerror());
6666
#endif
6767
}
6868

@@ -94,7 +94,7 @@ void* ModuleHandle::GetProcAddress(pcstr procName) const
9494
#ifdef WINDOWS
9595
Msg("! Failed to load procedure [%s] from DLL: 0x%d", procName, GetLastError());
9696
#elif defined(LINUX)
97-
Msg("! Failed to load procedure [%s] from DLL: 0x%d", procName, dlerror());
97+
Msg("! Failed to load procedure [%s] from shared library: %s", procName, dlerror());
9898
#endif
9999
}
100100

src/xrEngine/EngineAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void CEngineAPI::Initialize(void)
143143
InitializeRenderers();
144144

145145
hGame = XRay::LoadModule("xrGame");
146-
R_ASSERT2(hGame, "Game DLL raised exception during loading or there is no game DLL at all");
146+
R_ASSERT2(hGame->IsLoaded(), "Game DLL raised exception during loading or there is no game DLL at all");
147147

148148
pCreate = (Factory_Create*)hGame->GetProcAddress("xrFactory_Create");
149149
R_ASSERT(pCreate);

0 commit comments

Comments
 (0)