Skip to content

Commit

Permalink
use gd::set in CCBMFontConfiguration
Browse files Browse the repository at this point in the history
fixes #1193
  • Loading branch information
matcool authored Dec 17, 2024
1 parent 9dd7128 commit 6c039c6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions loader/include/Geode/cocos/label_nodes/CCLabelBMFont.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class CC_DLL CCBMFontConfiguration : public CCObject
tCCKerningHashElement *m_pKerningDictionary;

// Character Set defines the letters that actually exist in the font
std::set<unsigned int> *m_pCharacterSet;
gd::set<unsigned int> *m_pCharacterSet;
public:
CCBMFontConfiguration();
/**
Expand All @@ -148,9 +148,9 @@ class CC_DLL CCBMFontConfiguration : public CCObject
inline const char* getAtlasName(){ return m_sAtlasName.c_str(); }
inline void setAtlasName(const char* atlasName) { m_sAtlasName = atlasName; }

inline std::set<unsigned int>* getCharacterSet() const { return m_pCharacterSet; }
inline gd::set<unsigned int>* getCharacterSet() const { return m_pCharacterSet; }
private:
std::set<unsigned int>* parseConfigFile(const char *controlFile);
gd::set<unsigned int>* parseConfigFile(const char *controlFile);
void parseCharacterDefinition(gd::string line, ccBMFontDef *characterDefinition);
void parseInfoArguments(gd::string line);
void parseCommonArguments(gd::string line);
Expand Down

0 comments on commit 6c039c6

Please sign in to comment.