aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/MenuBackup.cpp
diff options
context:
space:
mode:
authordaoge <3523206925@qq.com>2026-03-03 03:04:10 +0800
committerGitHub <noreply@github.com>2026-03-03 03:04:10 +0800
commitb3feddfef372618c8a9d7a0abcaf18cfad866c18 (patch)
tree267761c3bb39241ba5c347bfbe2254d06686e287 /Minecraft.World/MenuBackup.cpp
parent84c31a2331f7a0ec85b9d438992e244f60e5020f (diff)
feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
Diffstat (limited to 'Minecraft.World/MenuBackup.cpp')
-rw-r--r--Minecraft.World/MenuBackup.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/MenuBackup.cpp b/Minecraft.World/MenuBackup.cpp
index 6d09f3e3..b6d3ba09 100644
--- a/Minecraft.World/MenuBackup.cpp
+++ b/Minecraft.World/MenuBackup.cpp
@@ -15,11 +15,11 @@ MenuBackup::MenuBackup(shared_ptr<Inventory> inventory, AbstractContainerMenu *m
void MenuBackup::save(short changeUid)
{
- ItemInstanceArray *backup = new ItemInstanceArray( (int)menu->slots->size() + 1 );
+ ItemInstanceArray *backup = new ItemInstanceArray( (int)menu->slots.size() + 1 );
(*backup)[0] = ItemInstance::clone(inventory->getCarried());
- for (unsigned int i = 0; i < menu->slots->size(); i++)
+ for (unsigned int i = 0; i < menu->slots.size(); i++)
{
- (*backup)[i + 1] = ItemInstance::clone(menu->slots->at(i)->getItem());
+ (*backup)[i + 1] = ItemInstance::clone(menu->slots.at(i)->getItem());
}
// TODO Is unordered_map use correct?
// Was backups.put(changeUid, backup);
@@ -39,9 +39,9 @@ void MenuBackup::rollback(short changeUid)
ItemInstanceArray *backup = backups->at(changeUid);
backups->clear();
inventory->setCarried( (*backup)[0] );
- for (unsigned int i = 0; i < menu->slots->size(); i++)
+ for (unsigned int i = 0; i < menu->slots.size(); i++)
{
- menu->slots->at(i)->set( (*backup)[i + 1] );
+ menu->slots.at(i)->set( (*backup)[i + 1] );
}
} \ No newline at end of file