diff options
| author | p0358 <p0358@users.noreply.github.com> | 2021-12-30 06:26:10 +0100 |
|---|---|---|
| committer | p0358 <p0358@users.noreply.github.com> | 2021-12-30 06:26:10 +0100 |
| commit | 4f7c3d02943a38941b79a638c5607b2b7f668956 (patch) | |
| tree | 57cf52a0fcf5aaebedc7c8340a88038857c50174 /NorthstarDedicatedTest/modmanager.cpp | |
| parent | cec11fbdefa6e96cffd635fe0047de5245764cc9 (diff) | |
| download | NorthstarLauncher-4f7c3d02943a38941b79a638c5607b2b7f668956.tar.gz NorthstarLauncher-4f7c3d02943a38941b79a638c5607b2b7f668956.zip | |
actually use custom allocation, override allocators of curl and rapidjson
Diffstat (limited to 'NorthstarDedicatedTest/modmanager.cpp')
| -rw-r--r-- | NorthstarDedicatedTest/modmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NorthstarDedicatedTest/modmanager.cpp b/NorthstarDedicatedTest/modmanager.cpp index 49c69c78..a9119075 100644 --- a/NorthstarDedicatedTest/modmanager.cpp +++ b/NorthstarDedicatedTest/modmanager.cpp @@ -22,7 +22,7 @@ Mod::Mod(fs::path modDir, char* jsonBuf) ModDirectory = modDir; - rapidjson::Document modJson; + rapidjson_document modJson; modJson.Parse<rapidjson::ParseFlag::kParseCommentsFlag | rapidjson::ParseFlag::kParseTrailingCommasFlag>(jsonBuf); // fail if parse error @@ -379,7 +379,7 @@ void ModManager::UnloadMods() // should we be doing this here or should scripts be doing this manually? // main issue with doing this here is when we reload mods for connecting to a server, we write enabled mods, which isn't necessarily what we wanna do if (!m_enabledModsCfg.HasMember(mod.Name.c_str())) - m_enabledModsCfg.AddMember(rapidjson::StringRef(mod.Name.c_str()), rapidjson::Value(false), m_enabledModsCfg.GetAllocator()); + m_enabledModsCfg.AddMember(rapidjson_document::StringRefType(mod.Name.c_str()), rapidjson_document::GenericValue(false), m_enabledModsCfg.GetAllocator()); m_enabledModsCfg[mod.Name.c_str()].SetBool(mod.Enabled); } |