diff options
-rw-r--r-- | Alc/alc.cpp | 6 | ||||
-rw-r--r-- | OpenAL32/Include/alError.h | 2 | ||||
-rw-r--r-- | OpenAL32/alError.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Alc/alc.cpp b/Alc/alc.cpp index 23cc4826..3a083048 100644 --- a/Alc/alc.cpp +++ b/Alc/alc.cpp @@ -1037,15 +1037,15 @@ static void alc_initconfig(void) str = getenv("ALSOFT_TRAP_ERROR"); if(str && (strcasecmp(str, "true") == 0 || strtol(str, nullptr, 0) == 1)) { - TrapALError = AL_TRUE; + TrapALError = true; TrapALCError = true; } else { str = getenv("ALSOFT_TRAP_AL_ERROR"); if(str && (strcasecmp(str, "true") == 0 || strtol(str, nullptr, 0) == 1)) - TrapALError = AL_TRUE; - TrapALError = GetConfigValueBool(nullptr, nullptr, "trap-al-error", TrapALError); + TrapALError = true; + TrapALError = !!GetConfigValueBool(nullptr, nullptr, "trap-al-error", TrapALError); str = getenv("ALSOFT_TRAP_ALC_ERROR"); if(str && (strcasecmp(str, "true") == 0 || strtol(str, nullptr, 0) == 1)) diff --git a/OpenAL32/Include/alError.h b/OpenAL32/Include/alError.h index 3e4f2373..7b64b302 100644 --- a/OpenAL32/Include/alError.h +++ b/OpenAL32/Include/alError.h @@ -5,7 +5,7 @@ #include "logging.h" -extern ALboolean TrapALError; +extern bool TrapALError; void alSetError(ALCcontext *context, ALenum errorCode, const char *msg, ...) DECL_FORMAT(printf, 3, 4); diff --git a/OpenAL32/alError.cpp b/OpenAL32/alError.cpp index 324f4c1b..a7895fb9 100644 --- a/OpenAL32/alError.cpp +++ b/OpenAL32/alError.cpp @@ -34,7 +34,7 @@ #include "alError.h" #include "alexcpt.h" -ALboolean TrapALError = AL_FALSE; +bool TrapALError{false}; void alSetError(ALCcontext *context, ALenum errorCode, const char *msg, ...) { |