dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Use unique_ptr for text layout font mapping.

Browse Source 
This must stay a pointer as the value passed to other structures.
This commit is contained in:
Peter Nelson
2023-05-18 08:36:54 +01:00
committed by PeterN
parent c38df2d589
commit bf8f24f9a8
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gfx_layout.h
View File

@@ -80,7 +80,7 @@ public:
Font(FontSize size, TextColour colour);
};
/** Mapping from index to font. */
/** Mapping from index to font. The pointer is owned by FontColourMap. */
using FontMap = std::map<int, Font *>;
/**
@@ -169,7 +169,7 @@ private:
static LineCacheItem &GetCachedParagraphLayout(std::string_view str, const FontState &state);
using FontColourMap = std::map<TextColour, Font *>;
using FontColourMap = std::map<TextColour, std::unique_ptr<Font>>;
static FontColourMap fonts[FS_END];
public:
static Font *GetFont(FontSize size, TextColour colour);