Merge pull request #19 from Pika-Software/dev

Fix wrong lines in errors + crash on changing `moonloader_detour_getinfo`

Author: dankmolot

VERSION

@@ -1 +1 @@
-2.1.3
+2.1.4

source/compiler.cpp

@@ -15,10 +15,10 @@ void yue_openlibs(void* state);
 
 using namespace MoonLoader;
 
-std::unordered_map<int, int> ParseYueLines(std::string_view code) {
+std::map<int, int> ParseYueLines(std::string_view code) {
     static std::regex YUE_LINE_REGEX("--\\s*(\\d*)\\s*$", std::regex_constants::optimize);
 
-    std::unordered_map<int, int> line_map;
+    std::map<int, int> line_map;
     Utils::Split(code, [&](std::string_view line, size_t num) {
         std::cmatch match;
         if (std::regex_search(line.data(), line.data() + line.size(), match, YUE_LINE_REGEX)) {

source/compiler.hpp

@@ -5,6 +5,7 @@
 
 #include <unordered_map>
 #include <unordered_set>
+#include <map>
 #include <string>
 #include <string_view>
 #include <optional>
@@ -35,7 +36,7 @@ namespace MoonLoader {
             size_t update_date = 0;
             Type type;
 
-            std::unordered_map<int, int> line_map;
+            std::map<int, int> line_map;
         };
 
     private:

source/core.cpp

@@ -280,6 +280,8 @@ void Core::Initialize(GarrysMod::Lua::ILuaInterface* LUA) {
 
     cvar = InterfacePointers::Cvar();
     if (cvar == nullptr) throw std::runtime_error("failed to get ICvar interface");
+
+    g_pCVar = cvar;
     for (ConVar* convar : moonloader_convars)
         cvar->RegisterConCommand(convar);
 

source/utils.hpp

@@ -13,6 +13,7 @@
 #include <optional>
 #include <memory>
 #include <unordered_map>
+#include <map>
 
 #if IS_SERVERSIDE
 #include <GarrysMod/FactoryLoader.hpp>
@@ -219,7 +220,7 @@ namespace MoonLoader::Utils {
         return std::string(buf.get(), buf.get() + size - 1); // We don't want the '\0' inside
     }
 
-    inline std::optional<int> FindClosestLine(const std::unordered_map<int, int>& lines, int line) {
+    inline std::optional<int> FindClosestLine(const std::map<int, int>& lines, int line) {
         int closest = -1;
         for (auto& [key, value] : lines) {
             if (key > line) break;