diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-12 13:24:16 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-12 21:23:10 +0100 |
commit | 306ad2effe4d0897453e61ad787e01dc47c33076 (patch) | |
tree | 75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/vector.h | |
parent | 66599a9896e0cf69b58c0a73152aba4750d87af2 (diff) | |
download | mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2 mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip |
General code cleanups
* Use default member initializers
* Use range-based for loops
* Avoid needless pointer references for ShopItem::mDuplicates
* Removed type aliases that are only used once or twice
* Removed more unused includes
* Removed some unused functions
* Removed superfluous .c_str()
* Rely on default copy and assignment operators for Vector class
* Use std::unique_ptr in some places
* Removed duplicated mPlayerMoney updating in SellDialog
* Removed duplicated Game::handleInput call
* Removed unused SDLInput::mMouseInWindow
* Removed remnant of manual widget positioning in HelpWindow
* Removed superfluous initialization of static pointers
Diffstat (limited to 'src/vector.h')
-rw-r--r-- | src/vector.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/vector.h b/src/vector.h index 9ff98aa1..5d7d63d7 100644 --- a/src/vector.h +++ b/src/vector.h @@ -33,11 +33,7 @@ class Vector { public: - Vector(): - x(0.0f), - y(0.0f), - z(0.0f) - {} + Vector() = default; Vector(float x, float y, float z = 0.0f): x(x), @@ -45,12 +41,6 @@ class Vector z(z) {} - Vector(const Vector &v): - x(v.x), - y(v.y), - z(v.z) - {} - /** * Returns true if all coordinates are set to 0, otherwise returns * false. @@ -60,14 +50,6 @@ class Vector return x == 0.0f && y == 0.0f && z == 0.0f; } - Vector &operator=(const Vector &v) - { - x = v.x; - y = v.y; - z = v.z; - return *this; - } - /** * Scale vector operator. */ @@ -187,7 +169,9 @@ class Vector return Vector(x / l, y / l, z / l); } - float x, y, z; + float x = 0.0f; + float y = 0.0f; + float z = 0.0f; }; inline bool operator == (const Vector &a, const Vector &b) |