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, 8 insertions, 8 deletions

diff --git a/Minecraft.World/TreeTile.h b/Minecraft.World/TreeTile.h
index b7e0d56d..8738c8cf 100644
--- a/Minecraft.World/TreeTile.h
+++ b/Minecraft.World/TreeTile.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "Tile.h"
+#include "RotatedPillarTile.h"
 
 class ChunkRebuildData;
 class Player;
 
-class TreeTile : public Tile
+class TreeTile : public RotatedPillarTile
 {	
 	friend class Tile;
 	friend class ChunkRebuildData;
@@ -25,26 +25,26 @@ public:
 
 	static const unsigned int TREE_NAMES[TREE_NAMES_LENGTH];
 
+	static const wstring TREE_STRING_NAMES[TREE_NAMES_LENGTH];
+
 	static const wstring TREE_TEXTURES[];
 
 private:
-	Icon **icons;
-	Icon *iconTop;
+	Icon *icons_side[TREE_NAMES_LENGTH];
+	Icon *icons_top[TREE_NAMES_LENGTH];
 
 protected:
 	TreeTile(int id);
 
 public:
-	virtual int getRenderShape();
 	virtual int getResourceCount(Random *random);
 	virtual int getResource(int data, Random *random, int playerBonusLevel);
 	virtual void onRemove(Level *level, int x, int y, int z, int id, int data);
-	virtual void setPlacedBy(Level *level, int x, int y, int z, shared_ptr<Mob> by);
-	virtual Icon *getTexture(int face, int data);
 	virtual unsigned int getDescriptionId(int iData = -1);
 
 protected:
-	int getSpawnResourcesAuxValue(int data);
+	virtual Icon *getTypeTexture(int type);
+	virtual Icon *getTopTexture(int type);
 
 public:
 	static int getWoodType(int data);