snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-22 23:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crash() rework

Browse source
This commit is contained in:
DepressedTWM 2026-06-01 10:01:31 -04:00
parent 022539379e
commit 17d1aba905
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/meow.cpp
View file

@ -40,9 +40,19 @@ static inline const char* glGetStringInt(GLenum name){
return (const char*) gl.GetString(name); return (const char*) gl.GetString(name);
} }
void crash(const char* reason, Exception::Type t, bool do_exp){ void crash(Exception::Type t, const char *fmt, ...){
char msg[1024]; char msg[1024];
SDL_snprintf(msg, sizeof msg, "Error occured! Error message: %s\n\n Want to create a crash log? You can share the crash log with the developers and help resolve the issue.", reason); va_list args;
va_start(args, fmt);
va_list args_copy;
va_copy(args_copy, args);
short len = SDL_vsnprintf(NULL, 0, fmt, args_copy);
va_end(args_copy);
char *buf = SDL_malloc((size_t)len + 1);
SDL_vsnprintf(buf, (size_t)len + 1, fmt, args);
va_end(args);
SDL_snprintf(msg, sizeof msg, "Error occured! Error message: %s\n\n Want to create a crash log? You can share the crash log with the developers and help resolve the issue.", buf);
SDL_MessageBoxData messageboxdata = { SDL_MessageBoxData messageboxdata = {
.flags = SDL_MESSAGEBOX_ERROR, .flags = SDL_MESSAGEBOX_ERROR,
.window = NULL, .window = NULL,
@ -53,7 +63,6 @@ void crash(const char* reason, Exception::Type t, bool do_exp){
.colorScheme = NULL .colorScheme = NULL
}; };
int buttonid = 0; int buttonid = 0;
if (SDL_ShowMessageBox(&messageboxdata, &buttonid) == false) { if (SDL_ShowMessageBox(&messageboxdata, &buttonid) == false) {
printf("[CRASHDUMP] %s\n", reason); printf("[CRASHDUMP] %s\n", reason);
@ -109,10 +118,8 @@ void crash(const char* reason, Exception::Type t, bool do_exp){
} }
} }
if(do_exp == true){ if(!t == Exception::MEOW)
if(!t == Exception::MEOW) throw Exception(t, msg);
throw Exception(t, msg);
}
} }

2
src/meow.h
View file

@ -1,4 +1,4 @@
#include "exception.h" #include "exception.h"
void crash(const char* reason, Exception::Type t, bool do_exp); void crash(Exception::Type t, const char *fmt, ...);
void ErrorMsg(const char* message); void ErrorMsg(const char* message);
void WarnMsg(const char* message); void WarnMsg(const char* message);