7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'main' into inline-hook

Browse source
This commit is contained in:
altalk23 2022-04-02 23:40:19 +03:00
commit 77ffdc3246
6 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin

@ -1 +1 @@
Subproject commit 0e4ba18eded9a1e78a7a4a8ddc7411d65a9b8b1c
Subproject commit bb45dd7dd3c6d748aed858456212f8add09e58eb

4
include/cocos/cocos2dx/label_nodes/CCLabelBMFont.h
View file

@ -260,7 +260,9 @@ public:
void setFntFile(const char* fntFile);
const char* getFntFile();
CCBMFontConfiguration* getConfiguration() const;
inline CCBMFontConfiguration* getConfiguration() const {
return m_pConfiguration;
}
#if CC_LABELBMFONT_DEBUG_DRAW
virtual void draw();
#endif // CC_LABELBMFONT_DEBUG_DRAW

2
include/loader/Interface.hpp
View file

@ -157,6 +157,6 @@ namespace geode {
}
inline const char* operator"" _sprite(const char* str, size_t) {
inline const char* operator"" _spr(const char* str, size_t) {
return geode::Mod::get()->expandSpriteName(str);
}

4
include/loader/Log.hpp
View file

@ -73,8 +73,8 @@ namespace geode {
public:
static inline Log get();
Log(Mod* m) : m_logptr(new LogPtr(m)) {}
Log() : Log(nullptr) {}
inline Log(Mod* m) : m_logptr(new LogPtr(m)) {}
inline Log() : Log(nullptr) {}
Log& operator<<(ostream_fn_type);

14
include/utils/string.hpp
View file

@ -20,15 +20,18 @@ namespace geode {
*/
GEODE_DLL std::wstring utf8ToWide(std::string const& str);
GEODE_DLL bool endsWith(std::string const& str, std::string const& substr);
GEODE_DLL bool endsWith(std::wstring const& str, std::wstring const& substr);
GEODE_DLL std::string & toLowerIP(std::string & str);
GEODE_DLL std::wstring& toLowerIP(std::wstring& str);
GEODE_DLL std::string toLower(std::string const& str);
GEODE_DLL std::wstring toLower(std::wstring const& str);
GEODE_DLL std::string & toUpperIP(std::string & str);
GEODE_DLL std::wstring& toUpperIP(std::wstring& str);
GEODE_DLL std::string toUpper(std::string const& str);
GEODE_DLL std::wstring toUpper(std::wstring const& str);
GEODE_DLL std::string& replaceIP(
std::string & str,
std::string const& orig,
@ -108,6 +111,11 @@ namespace geode {
GEODE_DLL std::wstring& normalizeIP(std::wstring & str);
GEODE_DLL std::string normalize(std::string const& str);
GEODE_DLL std::wstring normalize(std::wstring const& str);
GEODE_DLL bool startsWith(std::string const& str, std::string const& prefix);
GEODE_DLL bool startsWith(std::wstring const& str, std::wstring const& prefix);
GEODE_DLL bool endsWith(std::string const& str, std::string const& suffix);
GEODE_DLL bool endsWith(std::wstring const& str, std::wstring const& suffix);
}
}

2
kit/gen/data/Cocos2d.bro
View file

@ -225,6 +225,8 @@ class cocos2d::CCLabelBMFont {
}
class cocos2d::CCLabelTTF {
static cocos2d::CCLabelTTF* create() = mac 0x1fa7e0;
static cocos2d::CCLabelTTF* create(char const*, char const*, float) = mac 0x1fa840;
auto updateTexture() = mac 0x1fadc0;
virtual auto setString(char const*) = mac 0x1fad70;
}