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:
@@ -55,10 +55,10 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z)
|
||||
int belowTile = level->getTile(x, y - 1, z);
|
||||
if ((belowTile != Tile::grass_Id && belowTile != Tile::dirt_Id) || y >= Level::maxBuildHeight - treeHeight - 1) return false;
|
||||
|
||||
level->setTileNoUpdate(x, y - 1, z, Tile::dirt_Id);
|
||||
level->setTileNoUpdate(x + 1, y - 1, z, Tile::dirt_Id);
|
||||
level->setTileNoUpdate(x, y - 1, z + 1, Tile::dirt_Id);
|
||||
level->setTileNoUpdate(x + 1, y - 1, z + 1, Tile::dirt_Id);
|
||||
level->setTileAndData(x, y - 1, z, Tile::dirt_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x + 1, y - 1, z, Tile::dirt_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x, y - 1, z + 1, Tile::dirt_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x + 1, y - 1, z + 1, Tile::dirt_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
|
||||
PIXBeginNamedEvent(0,"MegaTree placing leaves, %d, %d, %d", x, z, y+treeHeight);
|
||||
placeLeaves(level, x, z, y + treeHeight, 2, random);
|
||||
@@ -189,7 +189,7 @@ void MegaTreeFeature::placeLeaves(Level *level, int x, int z, int topPosition, i
|
||||
PIXBeginNamedEvent(0,"Getting tile");
|
||||
int t = level->getTile(xx, yy, zz);
|
||||
PIXEndNamedEvent();
|
||||
if (!Tile::solid[t])
|
||||
if (t == 0 || t == Tile::leaves_Id)
|
||||
{
|
||||
PIXBeginNamedEvent(0,"Placing block");
|
||||
placeBlock(level, xx, yy, zz, Tile::leaves_Id, leafType);
|
||||
|
||||
Reference in New Issue
Block a user