Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* 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 97a4399472.

* 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>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.World/MenuBackup.cpp
View File

@@ -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] );
}
}