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:
@@ -0,0 +1,19 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "DropperTileEntity.h"
|
||||
|
||||
wstring DropperTileEntity::getName()
|
||||
{
|
||||
return hasCustomName() ? name : app.GetString(IDS_CONTAINER_DROPPER);
|
||||
}
|
||||
|
||||
// 4J Added
|
||||
shared_ptr<TileEntity> DropperTileEntity::clone()
|
||||
{
|
||||
shared_ptr<DropperTileEntity> result = shared_ptr<DropperTileEntity>( new DropperTileEntity() );
|
||||
TileEntity::clone(result);
|
||||
|
||||
result->name = name;
|
||||
|
||||
return result;
|
||||
}
|
||||
Reference in New Issue
Block a user