Compare commits

..

2 Commits

Author SHA1 Message Date
Alex ac1093f053 Merge aee5be9f18 into 9b3f9f356d 2025-12-05 03:53:43 +00:00
KimLS aee5be9f18 Fix some cereal includes 2025-12-04 19:53:31 -08:00
3 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -23,9 +23,9 @@
#include <string.h> #include <string.h>
#include <string> #include <string>
#include <time.h> #include <time.h>
#include "../cereal/include/cereal/archives/binary.hpp" #include <cereal/archives/binary.hpp>
#include "../cereal/include/cereal/types/string.hpp" #include <cereal/types/string.hpp>
#include "../cereal/include/cereal/types/vector.hpp" #include <cereal/types/vector.hpp>
#include "../common/version.h" #include "../common/version.h"
#include "emu_constants.h" #include "emu_constants.h"
#include "textures.h" #include "textures.h"
+1 -1
View File
@@ -38,7 +38,7 @@
#include "../raid.h" #include "../raid.h"
#include "../guilds.h" #include "../guilds.h"
//#include "../repositories/trader_repository.h" //#include "../repositories/trader_repository.h"
#include "../cereal/include/cereal/types/vector.hpp" #include <cereal/types/vector.hpp>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
+2 -2
View File
@@ -7,8 +7,8 @@
#include "items_repository.h" #include "items_repository.h"
#include "../../common/item_data.h" #include "../../common/item_data.h"
#include "../../common/races.h" #include "../../common/races.h"
#include "../cereal/include/cereal/archives/binary.hpp" #include <cereal/archives/binary.hpp>
#include "../cereal/include/cereal/types/string.hpp" #include <cereal/types/string.hpp>
class TraderRepository : public BaseTraderRepository { class TraderRepository : public BaseTraderRepository {
public: public: