From 119bff351450ea16ffda550b6e0f67379b29f708 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:37:16 +0700 Subject: Revert "shared_ptr -> std::shared_ptr" This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5. --- Minecraft.Client/ItemFrameRenderer.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'Minecraft.Client/ItemFrameRenderer.cpp') diff --git a/Minecraft.Client/ItemFrameRenderer.cpp b/Minecraft.Client/ItemFrameRenderer.cpp index 06f8992e..40769fb9 100644 --- a/Minecraft.Client/ItemFrameRenderer.cpp +++ b/Minecraft.Client/ItemFrameRenderer.cpp @@ -23,11 +23,11 @@ void ItemFrameRenderer::registerTerrainTextures(IconRegister *iconRegister) backTexture = iconRegister->registerIcon(L"itemframe_back"); } -void ItemFrameRenderer::render(std::shared_ptr _itemframe, double x, double y, double z, float rot, float a) +void ItemFrameRenderer::render(shared_ptr _itemframe, double x, double y, double z, float rot, float a) { - // 4J - original version used generics and thus had an input parameter of type EnderCrystal rather than std::shared_ptr we have here - + // 4J - original version used generics and thus had an input parameter of type EnderCrystal rather than shared_ptr we have here - // do some casting around instead - std::shared_ptr itemFrame = dynamic_pointer_cast(_itemframe); + shared_ptr itemFrame = dynamic_pointer_cast(_itemframe); glPushMatrix(); float xOffs = (float) (itemFrame->x - x) - 0.5f; @@ -47,7 +47,7 @@ void ItemFrameRenderer::render(std::shared_ptr _itemframe, double x, do } -void ItemFrameRenderer::drawFrame(std::shared_ptr itemFrame) +void ItemFrameRenderer::drawFrame(shared_ptr itemFrame) { Minecraft *pMinecraft=Minecraft::GetInstance(); @@ -102,14 +102,14 @@ void ItemFrameRenderer::drawFrame(std::shared_ptr itemFrame) glPopMatrix(); } -void ItemFrameRenderer::drawItem(std::shared_ptr entity) +void ItemFrameRenderer::drawItem(shared_ptr entity) { Minecraft *pMinecraft=Minecraft::GetInstance(); - std::shared_ptr instance = entity->getItem(); + shared_ptr instance = entity->getItem(); if (instance == NULL) return; - std::shared_ptr itemEntity = std::shared_ptr(new ItemEntity(entity->level, 0, 0, 0, instance)); + shared_ptr itemEntity = shared_ptr(new ItemEntity(entity->level, 0, 0, 0, instance)); itemEntity->getItem()->count = 1; itemEntity->bobOffs = 0; @@ -119,7 +119,7 @@ void ItemFrameRenderer::drawItem(std::shared_ptr entity) glRotatef(180 + entity->yRot, 0, 1, 0); glRotatef(-90 * entity->getRotation(), 0, 0, 1); - switch (entity->getRotation()) + switch (entity->getRotation()) { case 1: glTranslatef(-0.16f, -0.16f, 0); @@ -132,7 +132,7 @@ void ItemFrameRenderer::drawItem(std::shared_ptr entity) break; } - if (itemEntity->getItem()->getItem() == Item::map) + if (itemEntity->getItem()->getItem() == Item::map) { entityRenderDispatcher->textures->bindTexture(TN_MISC_MAPBG); Tesselator *t = Tesselator::getInstance(); @@ -150,13 +150,13 @@ void ItemFrameRenderer::drawItem(std::shared_ptr entity) t->vertexUV(0 - vo, 0 - vo, 0, 0, 0); t->end(); - std::shared_ptr data = Item::map->getSavedData(itemEntity->getItem(), entity->level); - if (data != NULL) + shared_ptr data = Item::map->getSavedData(itemEntity->getItem(), entity->level); + if (data != NULL) { entityRenderDispatcher->itemInHandRenderer->minimap->render(nullptr, entityRenderDispatcher->textures, data, entity->entityId); } - } - else + } + else { if (itemEntity->getItem()->getItem() == Item::compass) { @@ -178,7 +178,7 @@ void ItemFrameRenderer::drawItem(std::shared_ptr entity) ct->cycleFrames(); } } - + glPopMatrix(); } -- cgit v1.2.3