summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLaG1924 <lag1924@gmail.com>2021-06-06 14:52:38 +0200
committerLaG1924 <lag1924@gmail.com>2021-06-06 14:52:38 +0200
commit868a759dea6b9abbf887c9e8f40c61b6a6ddbf83 (patch)
tree85757ed6f19d33bc88861319d52fdd70444ae6ed /src
parentMerge pull request #44 from LaG1924/fix/protocol_support (diff)
downloadAltCraft-868a759dea6b9abbf887c9e8f40c61b6a6ddbf83.tar
AltCraft-868a759dea6b9abbf887c9e8f40c61b6a6ddbf83.tar.gz
AltCraft-868a759dea6b9abbf887c9e8f40c61b6a6ddbf83.tar.bz2
AltCraft-868a759dea6b9abbf887c9e8f40c61b6a6ddbf83.tar.lz
AltCraft-868a759dea6b9abbf887c9e8f40c61b6a6ddbf83.tar.xz
AltCraft-868a759dea6b9abbf887c9e8f40c61b6a6ddbf83.tar.zst
AltCraft-868a759dea6b9abbf887c9e8f40c61b6a6ddbf83.zip
Diffstat (limited to 'src')
-rw-r--r--src/AssetManager.cpp4
-rw-r--r--src/Plugin.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/AssetManager.cpp b/src/AssetManager.cpp
index 19cd452..514d008 100644
--- a/src/AssetManager.cpp
+++ b/src/AssetManager.cpp
@@ -1,7 +1,7 @@
#include "AssetManager.hpp"
#include <fstream>
-#include <experimental/filesystem>
+#include <filesystem>
#include <nlohmann/json.hpp>
#include <easylogging++.h>
@@ -16,7 +16,7 @@
#include "Utility.hpp"
#include "Plugin.hpp"
-namespace fs = std::experimental::filesystem::v1;
+namespace fs = std::filesystem;
const fs::path pathToAssets = "./assets/";
const std::string pathToAssetsList = "./items.json";
diff --git a/src/Plugin.cpp b/src/Plugin.cpp
index 618ea9d..83e9bdd 100644
--- a/src/Plugin.cpp
+++ b/src/Plugin.cpp
@@ -3,7 +3,7 @@
#include <vector>
#include <easylogging++.h>
-#include <sol.hpp>
+#include <sol/sol.hpp>
#include <optick.h>
#include "GameState.hpp"