From 169068b417323232cc6aac440f3d7a2d918b5917 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 14 Feb 2021 14:32:25 +0000 Subject: Code tidy-up --- game/network/rail.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'game/network/rail.h') diff --git a/game/network/rail.h b/game/network/rail.h index 58c26c3..ac944f3 100644 --- a/game/network/rail.h +++ b/game/network/rail.h @@ -3,6 +3,7 @@ #include "collection.hpp" #include "game/worldobject.h" +#include "gfx/gl/transform.h" #include "gfx/models/mesh.h" #include "gfx/models/vertex.hpp" #include "gfx/renderable.h" @@ -36,7 +37,7 @@ protected: class RailLinkStraight : public RailLink { public: RailLinkStraight(const NodePtr &, const NodePtr &); - Transform positionAt(float dist, unsigned char start) const override; + [[nodiscard]] Transform positionAt(float dist, unsigned char start) const override; private: RailLinkStraight(NodePtr, NodePtr, const glm::vec3 & diff); @@ -45,7 +46,7 @@ private: class RailLinkCurve : public RailLink { public: RailLinkCurve(const NodePtr &, const NodePtr &, glm::vec2); - Transform positionAt(float dist, unsigned char start) const override; + [[nodiscard]] Transform positionAt(float dist, unsigned char start) const override; private: RailLinkCurve(const NodePtr &, const NodePtr &, glm::vec3, const Arc); @@ -65,7 +66,7 @@ public: { const auto node1 = *nodes.insert(std::make_shared(a)).first; const auto node2 = *nodes.insert(std::make_shared(b)).first; - auto l = links.create(node1, node2, std::forward(params)...); + auto l {links.create(node1, node2, std::forward(params)...)}; joinLinks(l); return l; } @@ -76,7 +77,7 @@ private: Nodes nodes; void render(const Shader &) const override; void tick(TickDuration elapsed) override; - void joinLinks(LinkPtr) const; + void joinLinks(const LinkPtr &) const; std::shared_ptr texture; }; -- cgit v1.2.3