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>

1 files changed, 15 insertions, 15 deletions

diff --git a/Minecraft.World/BiomeDecorator.cpp b/Minecraft.World/BiomeDecorator.cpp
index 6ca7386c..a3cbf546 100644
--- a/Minecraft.World/BiomeDecorator.cpp
+++ b/Minecraft.World/BiomeDecorator.cpp
@@ -55,8 +55,8 @@ void BiomeDecorator::_init()
 	lapisOreFeature = new OreFeature(Tile::lapisOre_Id, 6);
 	yellowFlowerFeature = new FlowerFeature(Tile::flower_Id);
 	roseFlowerFeature = new FlowerFeature(Tile::rose_Id);
-	brownMushroomFeature = new FlowerFeature(Tile::mushroom1_Id);
-	redMushroomFeature = new FlowerFeature(Tile::mushroom2_Id);
+	brownMushroomFeature = new FlowerFeature(Tile::mushroom_brown_Id);
+	redMushroomFeature = new FlowerFeature(Tile::mushroom_red_Id);
 	hugeMushroomFeature = new HugeMushroomFeature();
 	reedsFeature = new ReedsFeature();
 	cactusFeature = new CactusFeature();
@@ -123,12 +123,12 @@ void BiomeDecorator::decorate()
 	PIXEndNamedEvent();
 
 	PIXBeginNamedEvent(0,"Decorate mushrooms/flowers/grass");
-    for (int i = 0; i < hugeMushrooms; i++)
+	for (int i = 0; i < hugeMushrooms; i++)
 	{
-        int x = xo + random->nextInt(16) + 8;
-        int z = zo + random->nextInt(16) + 8;
-        hugeMushroomFeature->place(level, random, x, level->getHeightmap(x, z), z);
-    }
+		int x = xo + random->nextInt(16) + 8;
+		int z = zo + random->nextInt(16) + 8;
+		hugeMushroomFeature->place(level, random, x, level->getHeightmap(x, z), z);
+	}
 
 	for (int i = 0; i < flowerCount; i++)
 	{
@@ -176,15 +176,15 @@ void BiomeDecorator::decorate()
 	}
 	if(deadBushFeature != NULL)delete deadBushFeature;
 
-    for (int i = 0; i < waterlilyCount; i++)
+	for (int i = 0; i < waterlilyCount; i++)
 	{
-        int x = xo + random->nextInt(16) + 8;
-        int z = zo + random->nextInt(16) + 8;
-        int y = random->nextInt(Level::genDepth);
-        while (y > 0 && level->getTile(x, y - 1, z) == 0)
-            y--;
-        waterlilyFeature->place(level, random, x, y, z);
-    }
+		int x = xo + random->nextInt(16) + 8;
+		int z = zo + random->nextInt(16) + 8;
+		int y = random->nextInt(Level::genDepth);
+		while (y > 0 && level->getTile(x, y - 1, z) == 0)
+			y--;
+		waterlilyFeature->place(level, random, x, y, z);
+	}
 
 	for (int i = 0; i < mushroomCount; i++)
 	{