|
|
@ -117,15 +117,13 @@ void ErrorAssert(int line, const char file[], const char fmt[], ...) |
|
|
|
va_list args; |
|
|
|
va_list args; |
|
|
|
va_start(args, fmt); |
|
|
|
va_start(args, fmt); |
|
|
|
vsnprintf(msg, sizeof(msg), fmt, args); |
|
|
|
vsnprintf(msg, sizeof(msg), fmt, args); |
|
|
|
#ifdef _MSC_VER |
|
|
|
#ifdef HS_DEBUGGING |
|
|
|
#ifndef PLASMA_EXTERNAL_RELEASE |
|
|
|
|
|
|
|
if (s_GuiAsserts) |
|
|
|
if (s_GuiAsserts) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if(_CrtDbgReport(_CRT_ASSERT, file, line, NULL, msg)) |
|
|
|
if(_CrtDbgReport(_CRT_ASSERT, file, line, NULL, msg)) |
|
|
|
DebugBreak(); |
|
|
|
DebugBreak(); |
|
|
|
} else
|
|
|
|
} else
|
|
|
|
#endif // PLASMA_EXTERNAL_RELEASE
|
|
|
|
#endif // HS_DEBUGGING
|
|
|
|
#endif // _MSC_VER
|
|
|
|
|
|
|
|
if (DebugIsDebuggerPresent()) { |
|
|
|
if (DebugIsDebuggerPresent()) { |
|
|
|
char str[] = "-------\nASSERTION FAILED:\nFile: %s Line: %i\nMessage: %s\n-------"; |
|
|
|
char str[] = "-------\nASSERTION FAILED:\nFile: %s Line: %i\nMessage: %s\n-------"; |
|
|
|
DebugMsg(str, file, line, msg); |
|
|
|
DebugMsg(str, file, line, msg); |
|
|
|