mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/LCE-Revelations.git
synced 2026-09-24 02:40:45 +00:00
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 <[email protected]>
This commit is contained in:
@@ -72,10 +72,6 @@ public:
|
||||
};
|
||||
|
||||
public:
|
||||
// int dir;
|
||||
//
|
||||
// int xTile, yTile, zTile;
|
||||
|
||||
Motive *motive;
|
||||
|
||||
private:
|
||||
@@ -88,7 +84,8 @@ public:
|
||||
Painting(Level *level, int x, int y, int z, int dir, wstring motiveName);
|
||||
|
||||
// 4J Stu - Added this so that we can use some shared_ptr functions that were needed in the ctor
|
||||
void PaintingPostConstructor(int dir);
|
||||
// 4J Stu - Added motive param for debugging/artists only
|
||||
void PaintingPostConstructor(int dir, int motive = -1);
|
||||
|
||||
protected:
|
||||
//void defineSynchedData();
|
||||
@@ -113,5 +110,5 @@ public:
|
||||
|
||||
virtual int getWidth();
|
||||
virtual int getHeight();
|
||||
virtual void dropItem();
|
||||
virtual void dropItem(shared_ptr<Entity> causedBy);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user