mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-04 22:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust PhysFS and OpenAL errors a bit

Browse source
This commit is contained in:
Struma 2023-05-08 00:18:26 -04:00
parent 486e0b68d4
commit eb300a9ef1
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/filesystem/filesystem.cpp
View file

@ -282,7 +282,14 @@ struct FileSystemPrivate {
static void throwPhysfsError(const char *desc) { static void throwPhysfsError(const char *desc) {
PHYSFS_ErrorCode ec = PHYSFS_getLastErrorCode(); PHYSFS_ErrorCode ec = PHYSFS_getLastErrorCode();
const char *englishStr = PHYSFS_getErrorByCode(ec); const char *englishStr;
if (ec == 0) {
// Sometimes on Windows PHYSFS_init can return null
// but the error code never changes
englishStr = "unknown error";
} else {
englishStr = PHYSFS_getErrorByCode(ec);
}
throw Exception(Exception::PHYSFSError, "%s: %s", desc, englishStr); throw Exception(Exception::PHYSFSError, "%s: %s", desc, englishStr);
} }

4
src/main.cpp
View file

@ -395,7 +395,7 @@ int main(int argc, char *argv[]) {
ALCdevice *alcDev = alcOpenDevice(0); ALCdevice *alcDev = alcOpenDevice(0);
if (!alcDev) { if (!alcDev) {
showInitError("Error opening OpenAL device"); showInitError("Could not detect an available audio device.");
SDL_DestroyWindow(win); SDL_DestroyWindow(win);
TTF_Quit(); TTF_Quit();
IMG_Quit(); IMG_Quit();
@ -517,7 +517,7 @@ static SDL_GLContext initGL(SDL_Window *win, Config &conf,
glCtx = SDL_GL_CreateContext(win); glCtx = SDL_GL_CreateContext(win);
if (!glCtx) { if (!glCtx) {
GLINIT_SHOWERROR(std::string("Error creating context: ") + SDL_GetError()); GLINIT_SHOWERROR(std::string("Could not create OpenGL context: ") + SDL_GetError());
return 0; return 0;
} }