Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-04-30 01:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1045 from diath/dft_cpy_mov_ctor

Browse Source 
Add default copy constructors to Color and Position classes
This commit is contained in:
Konrad Kuśnierz 2019-10-10 08:13:50 +02:00 committed by GitHub
commit 2f76fe1c3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/position.h
View File

@ -36,6 +36,8 @@ public:
Position() : x(65535), y(65535), z(255) { } Position() : x(65535), y(65535), z(255) { }
Position(uint16 x, uint16 y, uint8 z) : x(x), y(y), z(z) { } Position(uint16 x, uint16 y, uint8 z) : x(x), y(y), z(z) { }
Position(const Position &position) = default;
Position translatedToDirection(Otc::Direction direction) { Position translatedToDirection(Otc::Direction direction) {
Position pos = *this; Position pos = *this;
switch(direction) { switch(direction) {

2
src/framework/util/color.h
View File

@ -39,6 +39,8 @@ public:
Color(float r, float g, float b, float a = 1.0f) : m_r(r), m_g(g), m_b(b), m_a(a) { } Color(float r, float g, float b, float a = 1.0f) : m_r(r), m_g(g), m_b(b), m_a(a) { }
Color(const std::string& coltext); Color(const std::string& coltext);
Color(const Color &color) = default;
uint8 a() const { return m_a*255.0f; } uint8 a() const { return m_a*255.0f; }
uint8 b() const { return m_b*255.0f; } uint8 b() const { return m_b*255.0f; }
uint8 g() const { return m_g*255.0f; } uint8 g() const { return m_g*255.0f; }