diff --git a/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id b/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id index 2fd19b673d..11b82ca2c1 100644 --- a/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id +++ b/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id @@ -1 +1 @@ -b30514e90b5ed9a70853c63f20e9204052679459 \ No newline at end of file +410a885b1dddf03ae3268cc62a01e2658e2eb450 \ No newline at end of file diff --git a/scripting/javascript/bindings/cocos2d_specifics.hpp b/scripting/javascript/bindings/cocos2d_specifics.hpp index 8e816cdb9c..8029446206 100644 --- a/scripting/javascript/bindings/cocos2d_specifics.hpp +++ b/scripting/javascript/bindings/cocos2d_specifics.hpp @@ -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();