edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of optional, not available on Debian9 build

Browse source
This commit is contained in:
Dennis Felsing 2022-04-19 09:18:46 +02:00
parent b84a347817
commit 4e3d5c5626
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/client/components/tooltips.cpp
View file

@ -15,16 +15,16 @@ void CTooltips::OnReset()
void CTooltips::SetActiveTooltip(CTooltip &Tooltip) void CTooltips::SetActiveTooltip(CTooltip &Tooltip)
{ {
if(m_ActiveTooltip.has_value()) if(m_pActiveTooltip != nullptr)
return; return;
m_ActiveTooltip.emplace(Tooltip); m_pActiveTooltip = &Tooltip;
HoverTime = time_get(); HoverTime = time_get();
} }
inline void CTooltips::ClearActiveTooltip() inline void CTooltips::ClearActiveTooltip()
{ {
m_ActiveTooltip.reset(); m_pActiveTooltip = nullptr;
} }
void CTooltips::DoToolTip(const void *pID, const CUIRect *pNearRect, const char *pText, float WidthHint) void CTooltips::DoToolTip(const void *pID, const CUIRect *pNearRect, const char *pText, float WidthHint)
@ -61,9 +61,9 @@ void CTooltips::DoToolTip(const void *pID, const CUIRect *pNearRect, const char
void CTooltips::OnRender() void CTooltips::OnRender()
{ {
if(m_ActiveTooltip.has_value()) if(m_pActiveTooltip != nullptr)
{ {
CTooltip &Tooltip = m_ActiveTooltip.value(); CTooltip &Tooltip = *m_pActiveTooltip;
if(!UI()->MouseInside(&Tooltip.m_Rect)) if(!UI()->MouseInside(&Tooltip.m_Rect))
{ {

3
src/game/client/components/tooltips.h
View file

@ -5,7 +5,6 @@
#include <game/client/component.h> #include <game/client/component.h>
#include <game/client/ui.h> #include <game/client/ui.h>
#include <optional>
#include <unordered_map> #include <unordered_map>
struct CTooltip struct CTooltip
@ -23,7 +22,7 @@ struct CTooltip
class CTooltips : public CComponent class CTooltips : public CComponent
{ {
std::unordered_map<uintptr_t, CTooltip> m_Tooltips; std::unordered_map<uintptr_t, CTooltip> m_Tooltips;
std::optional<std::reference_wrapper<CTooltip>> m_ActiveTooltip; CTooltip *m_pActiveTooltip;
int64_t HoverTime; int64_t HoverTime;
/** /**