Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

closed #2363: Fixing compilation errors for JS projects.

This commit is contained in:
James Chen 2013-07-03 14:57:29 +08:00
parent 661a934e82
commit 72344a318e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
View File

@ -1 +1 @@
b30514e90b5ed9a70853c63f20e9204052679459
410a885b1dddf03ae3268cc62a01e2658e2eb450

14
scripting/javascript/bindings/cocos2d_specifics.hpp
View File

@ -101,9 +101,9 @@ public:
const jsval& getJSCallbackThis() const;
const jsval& getJSExtraData() const;
protected:
jsval jsCallback;
jsval jsThisObj;
jsval extraData;
jsval _jsCallback;
jsval _jsThisObj;
jsval _extraData;
};
@ -112,13 +112,13 @@ public:
JSCCBAnimationWrapper() {}
virtual ~JSCCBAnimationWrapper() {}
void animationCompleteCallback() const {
void animationCompleteCallback() {
JSContext *cx = ScriptingCore::getInstance()->getGlobalContext();
jsval retval = JSVAL_NULL;
if(!JSVAL_IS_VOID(jsCallback) && !JSVAL_IS_VOID(jsThisObj)) {
JS_CallFunctionValue(cx, JSVAL_TO_OBJECT(jsThisObj), jsCallback, 0, NULL, &retval);
if(!JSVAL_IS_VOID(_jsCallback) && !JSVAL_IS_VOID(_jsThisObj)) {
JS_CallFunctionValue(cx, JSVAL_TO_OBJECT(_jsThisObj), _jsCallback, 0, NULL, &retval);
}
}
@ -162,7 +162,7 @@ public:
void pause();
void scheduleFunc(float dt) const;
void scheduleFunc(float dt);
virtual void update(float dt);
Object* getTarget();