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

Merge branch 'dev' into misc-fixes

Browse source
This commit is contained in:
刘皓 2025-07-12 21:16:23 -04:00
commit c8d9ebb6be
No known key found for this signature in database
GPG key ID: 7901753DB465B711
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binding/binding-mri.cpp
View file

@ -1167,7 +1167,7 @@ static void showExc(VALUE exc, const BacktraceData &btData) {
file = btData.scriptNames.value(file, file);
std::string ms(640, '\0');
snprintf(&ms[0], ms.size(), "Script '%s' line %s: %s occured.\n\n%s",
snprintf(&ms[0], ms.size(), "Script '%s' line %s: %s occurred.\n\n%s",
file.c_str(), line, RSTRING_PTR(name), RSTRING_PTR(msg));
showMsg(ms);

6
src/display/gl/shader.cpp
View file

@ -200,7 +200,7 @@ void Shader::init(const unsigned char *vert, int vertSize,
{
printShaderLog(vertShader);
throw Exception(Exception::MKXPError,
"GLSL: An error occured while compiling vertex shader '%s' in program '%s'",
"GLSL: An error occurred while compiling vertex shader '%s' in program '%s'",
vertName, programName);
}
@ -214,7 +214,7 @@ void Shader::init(const unsigned char *vert, int vertSize,
{
printShaderLog(fragShader);
throw Exception(Exception::MKXPError,
"GLSL: An error occured while compiling fragment shader '%s' in program '%s'",
"GLSL: An error occurred while compiling fragment shader '%s' in program '%s'",
fragName, programName);
}
@ -234,7 +234,7 @@ void Shader::init(const unsigned char *vert, int vertSize,
{
printProgramLog(program);
throw Exception(Exception::MKXPError,
"GLSL: An error occured while linking program '%s' (vertex '%s', fragment '%s')",
"GLSL: An error occurred while linking program '%s' (vertex '%s', fragment '%s')",
programName, vertName, fragName);
}
}