Merge branch 'rc' into release

altmp · Sep 18, 2024 · bf225de · bf225de
2 parents 7944f35 + c63f14a
commit bf225de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/deps/cpp-sdk b/deps/cpp-sdk
diff --git a/module/deps/Log.h b/module/deps/Log.h
@@ -5,6 +5,8 @@
 
 class Log
 {
+    static constexpr const char* prefix = "[V8 Bytecode]";
+
     std::stringstream buf;
 
     typedef Log& (*LogFn)(Log&);
@@ -103,11 +105,11 @@ class Log
     {
         switch(log.type)
         {
-            case INFO: alt::ICore::Instance().LogInfo(log.buf.str()); break;
-            case DEBUG: alt::ICore::Instance().LogDebug(log.buf.str().c_str()); break;
-            case WARNING: alt::ICore::Instance().LogWarning(log.buf.str().c_str()); break;
-            case ERROR: alt::ICore::Instance().LogError(log.buf.str().c_str()); break;
-            case COLORED: alt::ICore::Instance().LogColored(log.buf.str().c_str()); break;
+            case INFO: alt::ICore::Instance().LogInfo(prefix, log.buf.str()); break;
+            case DEBUG: alt::ICore::Instance().LogDebug(prefix, log.buf.str().c_str()); break;
+            case WARNING: alt::ICore::Instance().LogWarning(prefix, log.buf.str().c_str()); break;
+            case ERROR: alt::ICore::Instance().LogError(prefix, log.buf.str().c_str()); break;
+            case COLORED: alt::ICore::Instance().LogColored(prefix, log.buf.str().c_str()); break;
         }
 
         log.buf.str("");

diff --git a/module/src/logger.h b/module/src/logger.h
@@ -5,7 +5,7 @@
 
 class Logger : public BytecodeCompiler::ILogger
 {
-    static constexpr const char* prefix = "[V8 Bytecode] ";
+    static constexpr const char* prefix = "[V8 Bytecode]";
 
 public:
     std::string GetHighlightColor() override
@@ -15,10 +15,10 @@ class Logger : public BytecodeCompiler::ILogger
 
     void Log(const std::string& message) override
     {
-        alt::ICore::Instance().LogColored(GetHighlightColor() + prefix + "~w~" + message);
+        alt::ICore::Instance().LogColored(prefix, message);
     }
     void LogError(const std::string& message) override
     {
-        alt::ICore::Instance().LogError(std::string(prefix) + " " + message);
+        alt::ICore::Instance().LogError(std::string(prefix), message);
     }
 };