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 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

View File

@@ -90,11 +90,21 @@ void MerchantContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item
}
}
int MerchantContainer::getName()
wstring MerchantContainer::getName()
{
return merchant->getDisplayName();
}
wstring MerchantContainer::getCustomName()
{
return L"";
}
bool MerchantContainer::hasCustomName()
{
return false;
}
int MerchantContainer::getMaxStackSize()
{
return Container::LARGE_MAX_STACK_SIZE;
@@ -113,6 +123,11 @@ void MerchantContainer::stopOpen()
{
}
bool MerchantContainer::canPlaceItem(int slot, shared_ptr<ItemInstance> item)
{
return true;
}
void MerchantContainer::setChanged()
{
updateSellItem();