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>
This commit is contained in:
@@ -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] );
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user