From 36cd51a453dd974efe10b4c57e5c74361bd68ff4 Mon Sep 17 00:00:00 2001 From: 2youyou2 <501251991@qq.com> Date: Wed, 27 Nov 2013 11:39:58 +0800 Subject: [PATCH] change ColliderFilter param type --- cocos/editor-support/cocostudio/CCColliderDetector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/editor-support/cocostudio/CCColliderDetector.cpp b/cocos/editor-support/cocostudio/CCColliderDetector.cpp index 6a35370fcf..5acd7642bc 100644 --- a/cocos/editor-support/cocostudio/CCColliderDetector.cpp +++ b/cocos/editor-support/cocostudio/CCColliderDetector.cpp @@ -34,7 +34,7 @@ namespace cocostudio { #if ENABLE_PHYSICS_BOX2D_DETECT -ColliderFilter::ColliderFilter(unsigned short categoryBits, unsigned short maskBits, signed short groupIndex) +ColliderFilter::ColliderFilter(uint16 categoryBits, uint16 maskBits, int16 groupIndex) : _categoryBits(categoryBits) , _maskBits(maskBits) , _groupIndex(groupIndex) @@ -52,7 +52,7 @@ void ColliderFilter::updateShape(b2Fixture *fixture) } #elif ENABLE_PHYSICS_CHIPMUNK_DETECT -ColliderFilter::ColliderFilter(uintptr_t collisionType, uintptr_t group) +ColliderFilter::ColliderFilter(cpCollisionType collisionType, cpGroup group) : _collisionType(collisionType) , _group(group) {