Fix crash warping to planets and leftover formatting errors
This commit is contained in:
parent
332983c97b
commit
baf3a1cf76
5
assets/opensb/help.config.patch
Normal file
5
assets/opensb/help.config.patch
Normal file
@ -0,0 +1,5 @@
|
||||
{
|
||||
"basicHelpText" : "Basic commands are: {}",
|
||||
"adminHelpText" : "Admin commands are: {}",
|
||||
"debugHelpText" : "Debug commands are: {}"
|
||||
}
|
@ -13,5 +13,7 @@
|
||||
"cursorTooltip" : {
|
||||
"font" : ""
|
||||
},
|
||||
"debugFont" : ""
|
||||
"debugFont" : "",
|
||||
|
||||
"planetNameFormatString" : "- {} -"
|
||||
}
|
@ -233,7 +233,7 @@ void fatalError(char const* message, bool showStackTrace) {
|
||||
if (showStackTrace)
|
||||
ss << outputStack(captureStack());
|
||||
|
||||
Logger::error(ss.str().c_str());
|
||||
Logger::log(LogLevel::Error, ss.str().c_str());
|
||||
MessageBoxW(NULL, stringToUtf16(ss.str()).get(), stringToUtf16("Error").get(), MB_OK | MB_ICONERROR | MB_SYSTEMMODAL);
|
||||
|
||||
std::abort();
|
||||
@ -245,7 +245,7 @@ void fatalException(std::exception const& e, bool showStackTrace) {
|
||||
if (showStackTrace)
|
||||
ss << "Caught at:" << std::endl << outputStack(captureStack());
|
||||
|
||||
Logger::error(ss.str().c_str());
|
||||
Logger::log(LogLevel::Error, ss.str().c_str());
|
||||
MessageBoxW(NULL, stringToUtf16(ss.str()).get(), stringToUtf16("Error").get(), MB_OK | MB_ICONERROR | MB_SYSTEMMODAL);
|
||||
|
||||
std::abort();
|
||||
|
@ -103,13 +103,13 @@ WorldId parseWorldId(String const& printedId) {
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& os, CelestialWorldId const& worldId) {
|
||||
os << printWorldId(worldId);
|
||||
os << (CelestialCoordinate)worldId;
|
||||
return os;
|
||||
}
|
||||
|
||||
|
||||
std::ostream& operator<<(std::ostream& os, ClientShipWorldId const& worldId) {
|
||||
os << printWorldId(worldId);
|
||||
os << ((Uuid)worldId).hex();
|
||||
return os;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user