Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/core/StarException_windows.cpp4
-rw-r--r--source/game/StarWarping.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/source/core/StarException_windows.cpp b/source/core/StarException_windows.cpp
index 54254d4..87d9ed6 100644
--- a/source/core/StarException_windows.cpp
+++ b/source/core/StarException_windows.cpp
@@ -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();
diff --git a/source/game/StarWarping.cpp b/source/game/StarWarping.cpp
index 442d18e..8268b16 100644
--- a/source/game/StarWarping.cpp
+++ b/source/game/StarWarping.cpp
@@ -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;
}