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>
This commit is contained in:
1 parent
84c31a2331
commit
b3feddfef3
2069 files changed
+264832
-139512
No files matched your search
@@ -4,9 +4,6 @@
|
||||
#include "net.minecraft.world.h"
|
||||
#include "Facing.h"
|
||||
|
||||
const wstring MelonTile::TEX = L"melon_side";
|
||||
const wstring MelonTile::TEX_TOP = L"melon_top";
|
||||
|
||||
MelonTile::MelonTile(int id) : Tile(id, Material::vegetable)
|
||||
{
|
||||
iconTop = NULL;
|
||||
@@ -40,6 +37,6 @@ int MelonTile::getResourceCountForLootBonus(int bonusLevel, Random *random)
|
||||
|
||||
void MelonTile::registerIcons(IconRegister *iconRegister)
|
||||
{
|
||||
icon = iconRegister->registerIcon(TEX);
|
||||
iconTop = iconRegister->registerIcon(TEX_TOP);
|
||||
icon = iconRegister->registerIcon(getIconName() + L"_side");
|
||||
iconTop = iconRegister->registerIcon(getIconName() + L"_top");
|
||||
}
|
||||
Reference in new issue
Block a user