From d65bc3cc8d3bb9793e5d4f8d7aa223abbc001886 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Sat, 19 Aug 2023 20:47:58 +1000 Subject: Add collision cycling to Material items --- source/game/StarToolUser.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'source/game/StarToolUser.cpp') diff --git a/source/game/StarToolUser.cpp b/source/game/StarToolUser.cpp index e0e32a8..7208c6e 100644 --- a/source/game/StarToolUser.cpp +++ b/source/game/StarToolUser.cpp @@ -535,21 +535,16 @@ void ToolUser::render(RenderCallback* renderCallback, bool inToolRange, bool shi return; } - // FIXME: Why isn't material item a PreviewTileTool, why is inToolRange - // passed in again, what is the difference here between the owner's tool - // range, can't MaterialItem figure this out? - if (inToolRange) { - if (auto materialItem = as(m_primaryHandItem.get())) - renderCallback->addTilePreviews(materialItem->preview(shifting)); - else if (auto liquidItem = as(m_primaryHandItem.get())) - renderCallback->addTilePreviews(liquidItem->preview(shifting)); - } - if (auto pri = as(m_primaryHandItem.get())) renderCallback->addTilePreviews(pri->preview(shifting)); else if (auto alt = as(m_altHandItem.get())) renderCallback->addTilePreviews(alt->preview(shifting)); + if (auto ren = as(m_primaryHandItem.get())) + ren->render(renderCallback, renderLayer); + if (auto ren = as(m_altHandItem.get())) + ren->render(renderCallback, renderLayer); + for (auto item : {m_primaryHandItem.get(), m_altHandItem.get()}) { if (auto activeItem = as(item)) { for (auto drawablePair : activeItem->entityDrawables()) -- cgit v1.2.3