chore: fix client build

LiteLDev · Oct 19, 2024 · 8c5de90 · 8c5de90
1 parent ff93ced
commit 8c5de90
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src-client/ll/core/main_win.cpp b/src-client/ll/core/main_win.cpp
@@ -29,15 +29,15 @@ void leviLaminaMain() {
 
     gui::init();
 
-    if (auto res = ::ll::i18n::getInstance().load(getSelfModIns()->getLangDir()); !res) {
+    if (auto res = i18n::getInstance().load(getSelfModIns()->getLangDir()); !res) {
         getLogger().error("i18n load failed");
         res.error().log(getLogger());
     }
 
     auto& config = getLeviConfig();
 
     if (config.language != "system") {
-        ::ll::i18n::defaultLocaleCode() = config.language;
+        i18n::defaultLocaleCode() = config.language;
     }
     CrashLogger::init();
 
@@ -116,17 +116,18 @@ LL_AUTO_TYPE_INSTANCE_HOOK(
 } // namespace ll
 
 BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ulReasonForCall, LPVOID /*lpReserved*/) {
+    using namespace ll;
     if (ulReasonForCall == DLL_PROCESS_DETACH) {
         mod::ModRegistrar::getInstance().releaseAllMods();
     }
     if (ulReasonForCall != DLL_PROCESS_ATTACH) return TRUE;
 
-    ::ll::setGamingStatus(::ll::GamingStatus::Default);
+    setGamingStatus(GamingStatus::Default);
     try {
-        ::ll::leviLaminaMain();
+        leviLaminaMain();
     } catch (...) {
-        ::ll::error_utils::printCurrentException(::ll::getLogger());
+        error_utils::printCurrentException(getLogger());
     }
-    ::ll::setGamingStatus(::ll::GamingStatus::Starting);
+    setGamingStatus(GamingStatus::Starting);
     return TRUE;
 }
diff --git a/src-server/ll/core/main_win.cpp b/src-server/ll/core/main_win.cpp
@@ -156,7 +156,7 @@ void unixSignalHandler(int signum) {
 void leviLaminaMain() {
     error_utils::initExceptionTranslator();
 
-    if (auto res = ::ll::i18n::getInstance().load(getSelfModIns()->getLangDir()); !res) {
+    if (auto res = i18n::getInstance().load(getSelfModIns()->getLangDir()); !res) {
         getLogger().error("i18n load failed");
         res.error().log(getLogger());
     }

diff --git a/src/ll/api/chrono/GameChrono.cpp b/src/ll/api/chrono/GameChrono.cpp
@@ -22,7 +22,7 @@ ServerClock::time_point ServerClock::now() noexcept {
 }
 
 GameTickClock::time_point GameTickClock::now() noexcept {
-    return ll::service::getLevel().transform([](auto& level) { return fromTick(level.getCurrentTick()); }
+    return ll::service::getLevel().transform([](auto& level) { return fromTick(level.getCurrentServerTick()); }
     ).value_or(time_point::min());
 }