Skip to content

Commit bbf2b1c

Browse files
committed
Rename MenuItemEvent
1 parent 7d78998 commit bbf2b1c

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

loader/include/Geode/ui/NodeEvent.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace geode {
2828
};
2929

3030
/// Fired when a CCMenuItem is Activated (after the callback).
31-
class MenuItemEvent : public GlobalEvent<NodeEvent, bool(), cocos2d::CCMenuItem*> {
31+
class MenuItemActivatedEvent : public GlobalEvent<NodeEvent, bool(), cocos2d::CCMenuItem*> {
3232
public:
3333
using GlobalEvent::GlobalEvent;
3434
};

loader/src/loader/ScriptEngine.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace geode {
88

99
ccScriptType getScriptType() {
1010
// Javascript engine is called without needing to change m_nLuaID
11-
return cocos2d::ccScriptType::kScriptTypeJavascript;
11+
return cocos2d::ccScriptType::kScriptTypeJavascript;
1212
}
1313

1414
void removeScriptObjectByCCObject(CCObject* object) {
@@ -17,12 +17,12 @@ namespace geode {
1717

1818
int executeNodeEvent(CCNode* node, int action) {
1919
NodeEvent(node, static_cast<NodeEventType>(action)).send();
20-
return -1;
20+
return -1;
2121
}
2222

2323
int executeMenuItemEvent(CCMenuItem* menuItem) {
24-
MenuItemEvent(menuItem).send();
25-
return -1;
24+
MenuItemActivatedEvent(menuItem).send();
25+
return -1;
2626
}
2727

2828
void removeScriptHandler(int handler) {}

0 commit comments

Comments
 (0)