mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-05-30 07:34:50 +00:00
TU19: merge Minecraft.World/Containers
keeping virtual destructors where possible
This commit is contained in:
@@ -15,19 +15,19 @@ MenuBackup::MenuBackup(std::shared_ptr<Inventory> inventory,
|
||||
|
||||
void MenuBackup::save(short changeUid) {
|
||||
ItemInstanceArray* backup =
|
||||
new ItemInstanceArray((int)menu->slots->size() + 1);
|
||||
new ItemInstanceArray((int)menu->slots.size() + 1);
|
||||
(*backup)[0] = ItemInstance::clone(inventory->getCarried());
|
||||
for (unsigned int i = 0; i < menu->slots->size(); i++) {
|
||||
(*backup)[i + 1] = ItemInstance::clone(menu->slots->at(i)->getItem());
|
||||
for (unsigned int i = 0; i < menu->slots.size(); i++) {
|
||||
(*backup)[i + 1] = ItemInstance::clone(menu->slots.at(i)->getItem());
|
||||
}
|
||||
// TODO Is std::unordered_map use correct?
|
||||
// TODO Is unordered_map use correct?
|
||||
// Was backups.put(changeUid, backup);
|
||||
(*backups)[changeUid] = backup;
|
||||
}
|
||||
|
||||
// Cannot use delete as function name as it is a reserved keyword
|
||||
void MenuBackup::deleteBackup(short changeUid) {
|
||||
// TODO Is the std::unordered_map use correct?
|
||||
// TODO Is the unordered_map use correct?
|
||||
// 4J Was backups.remove(changeUid);
|
||||
backups->erase(changeUid);
|
||||
}
|
||||
@@ -36,7 +36,7 @@ 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++) {
|
||||
menu->slots->at(i)->set((*backup)[i + 1]);
|
||||
for (unsigned int i = 0; i < menu->slots.size(); i++) {
|
||||
menu->slots.at(i)->set((*backup)[i + 1]);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user