diff --git a/Source/UI/UIHotkeyGuideWnd.cpp b/Source/UI/UIHotkeyGuideWnd.cpp index bdbfc0a7c..24b3364ab 100644 --- a/Source/UI/UIHotkeyGuideWnd.cpp +++ b/Source/UI/UIHotkeyGuideWnd.cpp @@ -53,6 +53,14 @@ HotkeyGuideKey::HotkeyGuideKey() : valid(false), x(0), y(0) { HotkeyGuideLabel::~HotkeyGuideLabel() { } +// INLINED +HotkeyGuideLabel& HotkeyGuideLabel::operator=(const HotkeyGuideLabel& other) { + this->text = other.text; + this->key = other.key; + this->altKey = other.altKey; + return *this; +} + // OFFSET: 0x00966C70 // FUNCTION: fn_13164 void UIHotkeyGuideWnd::Slot15(int, int) { diff --git a/Source/UI/UIHotkeyGuideWnd.h b/Source/UI/UIHotkeyGuideWnd.h index ee6ad65b7..014f831f7 100644 --- a/Source/UI/UIHotkeyGuideWnd.h +++ b/Source/UI/UIHotkeyGuideWnd.h @@ -26,7 +26,18 @@ struct HotkeyGuideKey { /* 000F */ unsigned char height; HotkeyGuideKey(); - __declspec(noinline) HotkeyGuideKey(int x, int y, unsigned char align, unsigned char width, unsigned char padding, unsigned char height); + // INLINED + HotkeyGuideKey& operator=(const HotkeyGuideKey& other) { + this->valid = other.valid; + this->x = other.x; + this->y = other.y; + this->align = other.align; + this->width = other.width; + this->padding = other.padding; + this->height = other.height; + return *this; + } + HotkeyGuideKey(int x, int y, unsigned char align, unsigned char width, unsigned char padding, unsigned char height); }; struct HotkeyGuideLabel { @@ -38,7 +49,9 @@ struct HotkeyGuideLabel { HotkeyGuideLabel() { } HotkeyGuideLabel(std::string text, HotkeyGuideKey key, HotkeyGuideKey altKey); + HotkeyGuideLabel(const HotkeyGuideLabel&) = default; ~HotkeyGuideLabel(); + HotkeyGuideLabel& operator=(const HotkeyGuideLabel& other); }; class UIHotkeyGuideWnd : public UIFrameWnd {