diff --git a/Resources/Models/MapObjects/BlockCursorActive.kv6 b/Resources/Models/MapObjects/BlockCursorLine.kv6 similarity index 100% rename from Resources/Models/MapObjects/BlockCursorActive.kv6 rename to Resources/Models/MapObjects/BlockCursorLine.kv6 diff --git a/Resources/Models/MapObjects/BlockCursorInactive.kv6 b/Resources/Models/MapObjects/BlockCursorSingle.kv6 similarity index 100% rename from Resources/Models/MapObjects/BlockCursorInactive.kv6 rename to Resources/Models/MapObjects/BlockCursorSingle.kv6 diff --git a/Sources/Client/Client.cpp b/Sources/Client/Client.cpp index 0dc3af19..2dc66d2a 100644 --- a/Sources/Client/Client.cpp +++ b/Sources/Client/Client.cpp @@ -324,8 +324,8 @@ namespace spades { renderer->RegisterModel("Models/Player/Head.kv6"); renderer->RegisterModel("Models/MapObjects/Intel.kv6"); renderer->RegisterModel("Models/MapObjects/CheckPoint.kv6"); - renderer->RegisterModel("Models/MapObjects/BlockCursorActive.kv6"); - renderer->RegisterModel("Models/MapObjects/BlockCursorInactive.kv6"); + renderer->RegisterModel("Models/MapObjects/BlockCursorLine.kv6"); + renderer->RegisterModel("Models/MapObjects/BlockCursorSingle.kv6"); renderer->RegisterImage("Gfx/Bullet/7.62mm.png"); renderer->RegisterImage("Gfx/Bullet/9mm.png"); renderer->RegisterImage("Gfx/Bullet/12gauge.png"); diff --git a/Sources/Client/Client_Scene.cpp b/Sources/Client/Client_Scene.cpp index e9ce7408..ed244800 100644 --- a/Sources/Client/Client_Scene.cpp +++ b/Sources/Client/Client_Scene.cpp @@ -653,15 +653,16 @@ namespace spades { if ((int)blocks.size() > p->GetNumBlocks()) color = MakeVector3(1.f, 0.f, 0.f); - IModel *curActive = renderer->RegisterModel("Models/MapObjects/BlockCursorActive.kv6"); - IModel *curInactive = renderer->RegisterModel("Models/MapObjects/BlockCursorInactive.kv6"); + IModel *curLine = renderer->RegisterModel("Models/MapObjects/BlockCursorLine.kv6"); + IModel *curSingle = renderer->RegisterModel("Models/MapObjects/BlockCursorSingle.kv6"); for (size_t i = 0; i < blocks.size(); i++) { + if (!active && (blocks.size() == 1 || (i > 0 && i < blocks.size() - 1))) continue; IntVector3 &v = blocks[i]; ModelRenderParam param; param.customColor = color; param.matrix = Matrix4::Translate(MakeVector3(v.x + .5f, v.y + .5f, v.z + .5f)); param.matrix = param.matrix * Matrix4::Scale(1.f / 24.f); - renderer->RenderModel(active ? curActive : curInactive, param); + renderer->RenderModel(blocks.size() > 1 ? curLine : curSingle, param); } }