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, 6 insertions, 2 deletions

diff --git a/Minecraft.Client/MobSpawnerRenderer.cpp b/Minecraft.Client/MobSpawnerRenderer.cpp
index 4ee772dd..02aac27f 100644
--- a/Minecraft.Client/MobSpawnerRenderer.cpp
+++ b/Minecraft.Client/MobSpawnerRenderer.cpp
@@ -9,14 +9,19 @@ void MobSpawnerRenderer::render(shared_ptr<TileEntity> _spawner, double x, doubl
 {
 	// 4J - dynamic cast required because we aren't using templates/generics in our version
 	shared_ptr<MobSpawnerTileEntity> spawner = dynamic_pointer_cast<MobSpawnerTileEntity>(_spawner);
+	render(spawner->getSpawner(), x, y, z, a);
+    glPopMatrix();
+}
 
+void MobSpawnerRenderer::render(BaseMobSpawner *spawner, double x, double y, double z, float a)
+{
 	glPushMatrix();
     glTranslatef((float) x + 0.5f, (float) y, (float) z + 0.5f);
 
     shared_ptr<Entity> e = spawner->getDisplayEntity();
     if (e != NULL)
 	{
-        e->setLevel(spawner->level);
+        e->setLevel(spawner->getLevel());
         float s = 7 / 16.0f;
         glTranslatef(0, 0.4f, 0);
         glRotatef((float) (spawner->oSpin + (spawner->spin - spawner->oSpin) * a) * 10, 0, 1, 0);
@@ -26,5 +31,4 @@ void MobSpawnerRenderer::render(shared_ptr<TileEntity> _spawner, double x, doubl
         e->moveTo(x, y, z, 0, 0);
         EntityRenderDispatcher::instance->render(e, 0, 0, 0, 0, a);
     }
-    glPopMatrix();
 }