From 83e7cedffefde8d4b18c495206a93563b0b23565 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 29 Apr 2024 01:17:56 +0300 Subject: [PATCH] gcc warning fix --- src/files/WorldRegions.cpp | 3 ++- src/frontend/hud.cpp | 3 +-- src/frontend/hud.h | 6 +++--- src/items/Inventories.cpp | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp index 99d8ba3f..565a4994 100644 --- a/src/files/WorldRegions.cpp +++ b/src/files/WorldRegions.cpp @@ -380,8 +380,9 @@ void WorldRegions::put(Chunk* chunk){ // Writing block inventories if (!chunk->inventories.empty()){ uint datasize; + auto data = write_inventories(chunk, datasize); put(chunk->x, chunk->z, REGION_LAYER_INVENTORIES, - write_inventories(chunk, datasize), datasize, false); + std::move(data), datasize, false); } } diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 5ac59be6..bcbf5d03 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -360,8 +360,7 @@ void Hud::openPermanent(UiDocument* doc) { auto invview = std::dynamic_pointer_cast(root); if (invview) { - auto inventory = player->getInventory(); - invview->bind(inventory, frontend); + invview->bind(player->getInventory(), frontend); } add(HudElement(hud_element_mode::permanent, doc, doc->getRoot(), false)); } diff --git a/src/frontend/hud.h b/src/frontend/hud.h index f6f06bcf..f756598a 100644 --- a/src/frontend/hud.h +++ b/src/frontend/hud.h @@ -1,5 +1,5 @@ -#ifndef SRC_HUD_H_ -#define SRC_HUD_H_ +#ifndef FRONTEND_HUD_H_ +#define FRONTEND_HUD_H_ #include "../typedefs.h" @@ -162,4 +162,4 @@ public: std::shared_ptr getBlockInventory(); }; -#endif // SRC_HUD_H_ +#endif // FRONTEND_HUD_H_ diff --git a/src/items/Inventories.cpp b/src/items/Inventories.cpp index 47441059..3fe93c7c 100644 --- a/src/items/Inventories.cpp +++ b/src/items/Inventories.cpp @@ -50,8 +50,7 @@ std::shared_ptr Inventories::clone(int64_t id) { auto original = get(id); if (original == nullptr) return nullptr; - auto origptr = reinterpret_cast(original.get()); - auto clone = std::make_shared(*origptr); + auto clone = std::make_shared(*original); clone->setId(level.getWorld()->getNextInventoryId()); store(clone); return clone;