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:
@@ -5,7 +5,7 @@
|
||||
#include "SignTileEntity.h"
|
||||
#include "SignTile.h"
|
||||
|
||||
SignTile::SignTile(int id, eINSTANCEOF clas, bool onGround) : EntityTile(id, Material::wood, isSolidRender())
|
||||
SignTile::SignTile(int id, eINSTANCEOF clas, bool onGround) : BaseEntityTile(id, Material::wood, isSolidRender())
|
||||
{
|
||||
this->onGround = onGround;
|
||||
this->clas = clas;
|
||||
@@ -32,7 +32,7 @@ AABB *SignTile::getAABB(Level *level, int x, int y, int z)
|
||||
AABB *SignTile::getTileAABB(Level *level, int x, int y, int z)
|
||||
{
|
||||
updateShape(level, x, y, z);
|
||||
return EntityTile::getTileAABB(level, x, y, z);
|
||||
return BaseEntityTile::getTileAABB(level, x, y, z);
|
||||
}
|
||||
|
||||
void SignTile::updateShape(LevelSource *level, int x, int y, int z, int forceData, shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
|
||||
@@ -112,10 +112,10 @@ void SignTile::neighborChanged(Level *level, int x, int y, int z, int type)
|
||||
if (remove)
|
||||
{
|
||||
spawnResources(level, x, y, z, level->getData(x, y, z), 0);
|
||||
level->setTile(x, y, z, 0);
|
||||
level->removeTile(x, y, z);
|
||||
}
|
||||
|
||||
EntityTile::neighborChanged(level, x, y, z, type);
|
||||
BaseEntityTile::neighborChanged(level, x, y, z, type);
|
||||
}
|
||||
|
||||
int SignTile::cloneTileId(Level *level, int x, int y, int z)
|
||||
|
||||
Reference in New Issue
Block a user