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

inline missing getters

Browse source
This commit is contained in:
altalk23 2022-03-21 19:29:15 +03:00
parent e1fc1c69c8
commit 8bdc55248d
7 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin

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

2
include/cocos/cocos2dx/CCDirector.h
View file

@ -352,7 +352,7 @@ protected:
*/
void setContentScaleFactor(float scaleFactor);
public:
float getContentScaleFactor(void);
inline float getContentScaleFactor(void) { return m_fContentScaleFactor; }
RT_ADD(
public:

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

@ -148,7 +148,7 @@ public:
inline const char* getAtlasName(){ return m_sAtlasName.c_str(); }
inline void setAtlasName(const char* atlasName) { m_sAtlasName = atlasName; }
std::set<unsigned int>* getCharacterSet() const;
inline std::set<unsigned int>* getCharacterSet() const { return m_pCharacterSet; }
private:
std::set<unsigned int>* parseConfigFile(const char *controlFile);
void parseCharacterDefinition(gd::string line, ccBMFontDef *characterDefinition);

4
include/loader/Notification.hpp
View file

@ -76,7 +76,7 @@ namespace geode {
template <typename T>
void send(Notification<T> n, Mod* m) {
for (auto& obs : m_observers[m][n.selector()]) {
obs->into<T>()->m_callback(n);
obs->template into<T>()->m_callback(n);
}
}
@ -84,7 +84,7 @@ namespace geode {
void broadcast(Notification<T> n) {
for (auto& [k, v] : m_observers) {
for (auto& obs : v[n.selector()]) {
obs->into<T>()->m_callback(n);
obs->template into<T>()->m_callback(n);
}
}
}

4
kit/gen/HeaderGen.cpp
View file

@ -55,11 +55,11 @@ struct {class_name}{base_classes}{final} {{
void sortClass(Root& r, ClassDefinition* c, set<ClassDefinition*>& looked, vector<ClassDefinition*>& ordered) {
if (c->name.find("DS_Dictionary") != string::npos) return;
if (c->name.find("cocos2d::") != string::npos) return; // cocos headers exist already
if (c->name.find("cocos2d") != string::npos) return; // cocos headers exist already
if (looked.find(c) == looked.end()) {
looked.insert(c);
for (string j : c->depends) {
if (j.find("cocos2d::") != string::npos) continue;
if (j.find("cocos2d") != string::npos) continue;
if (r.classes.count(c->name) == 0) {
cacerr("Expected class definition for %s\n", c->name.c_str());
}

2
kit/gen/SourceGen.cpp
View file

@ -310,7 +310,7 @@ int main(int argc, char** argv) {
}
if (CacShare::platform == kMac || CacShare::platform == kIos) {
for (auto& i : c.inlines) {
if (c.name.find("cocos2d::") == string::npos) continue; // cocos inlines
if (c.name.find("cocos2d") == string::npos) continue; // cocos inlines
output += i.inlined + "\n";
}
}

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

@ -669,6 +669,7 @@ class cocos2d::CCSprite {
static cocos2d::CCSprite* createWithSpriteFrame(cocos2d::CCSpriteFrame*) = mac 0x132cb0;
static cocos2d::CCSprite* createWithSpriteFrameName(char const*) = mac 0x132dc0, ios 0x15b3ec;
static cocos2d::CCSprite* createWithTexture(cocos2d::CCTexture2D*) = mac 0x132790;
static cocos2d::CCSprite* createWithTexture(cocos2d::CCTexture2D*, cocos2d::CCRect const&) = mac 0x132960;
void setFlipX(bool) = mac 0x134be0;
void setFlipY(bool) = mac 0x134c30;