From 119bff351450ea16ffda550b6e0f67379b29f708 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:37:16 +0700 Subject: Revert "shared_ptr -> std::shared_ptr" This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5. --- Minecraft.World/SavedDataStorage.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Minecraft.World/SavedDataStorage.cpp') diff --git a/Minecraft.World/SavedDataStorage.cpp b/Minecraft.World/SavedDataStorage.cpp index 67b15c51..cacfa688 100644 --- a/Minecraft.World/SavedDataStorage.cpp +++ b/Minecraft.World/SavedDataStorage.cpp @@ -8,11 +8,11 @@ #include "ConsoleSaveFileIO.h" -SavedDataStorage::SavedDataStorage(LevelStorage *levelStorage) +SavedDataStorage::SavedDataStorage(LevelStorage *levelStorage) { /* - cache = new unordered_map >; - savedDatas = new vector >; + cache = new unordered_map >; + savedDatas = new vector >; usedAuxIds = new unordered_map; */ @@ -20,28 +20,28 @@ SavedDataStorage::SavedDataStorage(LevelStorage *levelStorage) loadAuxValues(); } -std::shared_ptr SavedDataStorage::get(const type_info& clazz, const wstring& id) +shared_ptr SavedDataStorage::get(const type_info& clazz, const wstring& id) { AUTO_VAR(it, cache.find( id )); if (it != cache.end()) return (*it).second; - std::shared_ptr data = nullptr; + shared_ptr data = nullptr; if (levelStorage != NULL) { //File file = levelStorage->getDataFile(id); ConsoleSavePath file = levelStorage->getDataFile(id); - if (!file.getName().empty() && levelStorage->getSaveFile()->doesFileExist( file ) ) + if (!file.getName().empty() && levelStorage->getSaveFile()->doesFileExist( file ) ) { // mob = dynamic_pointer_cast(Mob::_class->newInstance( level )); //data = clazz.getConstructor(String.class).newInstance(id); if( clazz == typeid(MapItemSavedData) ) { - data = dynamic_pointer_cast( std::shared_ptr(new MapItemSavedData(id)) ); + data = dynamic_pointer_cast( shared_ptr(new MapItemSavedData(id)) ); } else if( clazz == typeid(Villages) ) { - data = dynamic_pointer_cast( std::shared_ptr(new Villages(id) ) ); + data = dynamic_pointer_cast( shared_ptr(new Villages(id) ) ); } else { @@ -59,13 +59,13 @@ std::shared_ptr SavedDataStorage::get(const type_info& clazz, const w if (data != NULL) { - cache.insert( unordered_map >::value_type( id , data ) ); + cache.insert( unordered_map >::value_type( id , data ) ); savedDatas.push_back(data); } return data; } -void SavedDataStorage::set(const wstring& id, std::shared_ptr data) +void SavedDataStorage::set(const wstring& id, shared_ptr data) { if (data == NULL) { @@ -91,7 +91,7 @@ void SavedDataStorage::save() AUTO_VAR(itEnd, savedDatas.end()); for (AUTO_VAR(it, savedDatas.begin()); it != itEnd; it++) { - std::shared_ptr data = *it; //savedDatas->at(i); + shared_ptr data = *it; //savedDatas->at(i); if (data->isDirty()) { save(data); @@ -100,7 +100,7 @@ void SavedDataStorage::save() } } -void SavedDataStorage::save(std::shared_ptr data) +void SavedDataStorage::save(shared_ptr data) { if (levelStorage == NULL) return; //File file = levelStorage->getDataFile(data->id); -- cgit v1.2.3