change cpp to Point to get rid of a few warnings
Merge branch 'master' of https://github.com/nickflink/cocos2d-x