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:
@@ -10,15 +10,16 @@ EnchantmentTableEntity::EnchantmentTableEntity()
|
||||
random = new Random();
|
||||
|
||||
time = 0;
|
||||
flip = 0.0f;
|
||||
flip = 0.0f;
|
||||
oFlip = 0.0f;
|
||||
flipT = 0.0f;
|
||||
flipA = 0.0f;
|
||||
open = 0.0f;
|
||||
open = 0.0f;
|
||||
oOpen = 0.0f;
|
||||
rot = 0.0f;
|
||||
rot = 0.0f;
|
||||
oRot = 0.0f;
|
||||
tRot = 0.0f;
|
||||
name = L"";
|
||||
}
|
||||
|
||||
EnchantmentTableEntity::~EnchantmentTableEntity()
|
||||
@@ -26,6 +27,18 @@ EnchantmentTableEntity::~EnchantmentTableEntity()
|
||||
delete random;
|
||||
}
|
||||
|
||||
void EnchantmentTableEntity::save(CompoundTag *base)
|
||||
{
|
||||
TileEntity::save(base);
|
||||
if (hasCustomName()) base->putString(L"CustomName", name);
|
||||
}
|
||||
|
||||
void EnchantmentTableEntity::load(CompoundTag *base)
|
||||
{
|
||||
TileEntity::load(base);
|
||||
if (base->contains(L"CustomName")) name = base->getString(L"CustomName");
|
||||
}
|
||||
|
||||
void EnchantmentTableEntity::tick()
|
||||
{
|
||||
TileEntity::tick();
|
||||
@@ -89,6 +102,26 @@ void EnchantmentTableEntity::tick()
|
||||
flip = flip + flipA;
|
||||
}
|
||||
|
||||
wstring EnchantmentTableEntity::getName()
|
||||
{
|
||||
return hasCustomName() ? name : app.GetString(IDS_ENCHANT);
|
||||
}
|
||||
|
||||
wstring EnchantmentTableEntity::getCustomName()
|
||||
{
|
||||
return hasCustomName() ? name : L"";
|
||||
}
|
||||
|
||||
bool EnchantmentTableEntity::hasCustomName()
|
||||
{
|
||||
return !name.empty();
|
||||
}
|
||||
|
||||
void EnchantmentTableEntity::setCustomName(const wstring &name)
|
||||
{
|
||||
this->name = name;
|
||||
}
|
||||
|
||||
shared_ptr<TileEntity> EnchantmentTableEntity::clone()
|
||||
{
|
||||
shared_ptr<EnchantmentTableEntity> result = shared_ptr<EnchantmentTableEntity>( new EnchantmentTableEntity() );
|
||||
|
||||
Reference in New Issue
Block a user