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

fix warning

This commit is contained in:
minggo 2014-10-21 11:40:34 +08:00
parent 7eead2b75a
commit db8dc25b01
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp
View File

@ -209,7 +209,7 @@ void Timeline::binarySearchKeyFrame(int frameIndex)
void Timeline::updateCurrentKeyFrame(int frameIndex)
{
if(frameIndex > 60)
int a = 0;
//! If play to current frame's front or back, then find current frame again
if (frameIndex < _currentKeyFrameIndex || frameIndex >= _currentKeyFrameIndex + _betweenDuration)
{

2
cocos/ui/UILayoutComponent.cpp
View File

@ -62,7 +62,7 @@ namespace ui {
}
//Size
const Vec2& LayoutComponent::getOwnerContentSize()const
Vec2 LayoutComponent::getOwnerContentSize()const
{
return this->getOwner()->getContentSize();
}

2
cocos/ui/UILayoutComponent.h
View File

@ -68,7 +68,7 @@ NS_CC_BEGIN
const Vec2& getOwnerPosition()const;
void setOwnerPosition(const Vec2& point);
const Vec2& getOwnerContentSize()const;
Vec2 getOwnerContentSize()const;
void setOwnerContentSize(const Vec2& size);
const Vec2& getPercentContentSize()const;