From 4a1b59927f1a5ea692cee71df415ebb54f7a368d Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 16 Feb 2021 18:55:24 +0000
Subject: Rename types in LinkHistory
---
game/vehicles/vehicle.cpp | 6 +++---
game/vehicles/vehicle.h | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'game/vehicles')
diff --git a/game/vehicles/vehicle.cpp b/game/vehicles/vehicle.cpp
index f722cff..fceb37c 100644
--- a/game/vehicles/vehicle.cpp
+++ b/game/vehicles/vehicle.cpp
@@ -10,7 +10,7 @@ Vehicle::Vehicle(const LinkPtr & l, const std::string & obj, const std::string &
linkHist.add(l, 0);
}
-LinkHistory::Return
+LinkHistory::Entry
LinkHistory::add(const LinkWPtr & l, unsigned char d)
{
links.insert(links.begin(), {l, d});
@@ -23,13 +23,13 @@ LinkHistory::add(const LinkWPtr & l, unsigned char d)
return {lp, d};
}
-LinkHistory::Return
+LinkHistory::Entry
LinkHistory::getCurrent() const
{
return {links.front().first.lock(), links.front().second};
}
-LinkHistory::Return
+LinkHistory::Entry
LinkHistory::getAt(float len, float * rem) const
{
auto litr = links.begin();
diff --git a/game/vehicles/vehicle.h b/game/vehicles/vehicle.h
index 15d401b..25ed5bb 100644
--- a/game/vehicles/vehicle.h
+++ b/game/vehicles/vehicle.h
@@ -11,14 +11,14 @@
class LinkHistory {
public:
- using Entry = std::pair<LinkWPtr, unsigned char /*dir*/>;
- using Return = std::pair<LinkCPtr, unsigned char /*dir*/>;
- Return add(const LinkWPtr &, unsigned char);
- [[nodiscard]] Return getCurrent() const;
- [[nodiscard]] Return getAt(float, float *) const;
+ using WEntry = std::pair<LinkWPtr, unsigned char /*dir*/>;
+ using Entry = std::pair<LinkCPtr, unsigned char /*dir*/>;
+ Entry add(const LinkWPtr &, unsigned char);
+ [[nodiscard]] Entry getCurrent() const;
+ [[nodiscard]] Entry getAt(float, float *) const;
private:
- std::vector<Entry> links;
+ std::vector<WEntry> links;
float totalLen {0.F};
};
--
cgit v1.2.3