evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash warping to planets and leftover formatting errors

Browse Source
This commit is contained in:
Kae 2023-06-27 20:55:10 +10:00
parent 332983c97b
commit baf3a1cf76
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/opensb/help.config.patch Normal file
View File

@ -0,0 +1,5 @@
{
"basicHelpText" : "Basic commands are: {}",
"adminHelpText" : "Admin commands are: {}",
"debugHelpText" : "Debug commands are: {}"
}

4
assets/opensb/interface.config.patch
View File

@ -13,5 +13,7 @@
"cursorTooltip" : { "cursorTooltip" : {
"font" : "" "font" : ""
}, },
"debugFont" : "" "debugFont" : "",
"planetNameFormatString" : "- {} -"
} }

4
source/core/StarException_windows.cpp
View File

@ -233,7 +233,7 @@ void fatalError(char const* message, bool showStackTrace) {
if (showStackTrace) if (showStackTrace)
ss << outputStack(captureStack()); 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); MessageBoxW(NULL, stringToUtf16(ss.str()).get(), stringToUtf16("Error").get(), MB_OK | MB_ICONERROR | MB_SYSTEMMODAL);
std::abort(); std::abort();
@ -245,7 +245,7 @@ void fatalException(std::exception const& e, bool showStackTrace) {
if (showStackTrace) if (showStackTrace)
ss << "Caught at:" << std::endl << outputStack(captureStack()); 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); MessageBoxW(NULL, stringToUtf16(ss.str()).get(), stringToUtf16("Error").get(), MB_OK | MB_ICONERROR | MB_SYSTEMMODAL);
std::abort(); std::abort();

4
source/game/StarWarping.cpp
View File

@ -103,13 +103,13 @@ WorldId parseWorldId(String const& printedId) {
} }
std::ostream& operator<<(std::ostream& os, CelestialWorldId const& worldId) { std::ostream& operator<<(std::ostream& os, CelestialWorldId const& worldId) {
os << printWorldId(worldId); os << (CelestialCoordinate)worldId;
return os; return os;
} }
std::ostream& operator<<(std::ostream& os, ClientShipWorldId const& worldId) { std::ostream& operator<<(std::ostream& os, ClientShipWorldId const& worldId) {
os << printWorldId(worldId); os << ((Uuid)worldId).hex();
return os; return os;
} }