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

Fix minor typos (#18289)

This commit is contained in:
mogemimi 2017-09-20 10:05:00 +09:00 committed by minggo
parent 0c5ba220b1
commit a5374d0411
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCTransition.cpp
View File

@ -91,7 +91,7 @@ bool TransitionScene::initWithDuration(float t, Scene *scene)
if (_outScene == nullptr)
{
_outScene = Scene::create();
// just change its state is running that can run actoins later
// just change its state is running that can run actions later
// issue: https://github.com/cocos2d/cocos2d-x/issues/17442
_outScene->onEnter();
}

6
cocos/audio/android/jni/cddandroidAndroidJavaEngine.h
View File

@ -22,8 +22,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __CDDANDRIODANDROIDJAVAENGINE_H__
#define __CDDANDRIODANDROIDJAVAENGINE_H__
#ifndef __CDDANDROIDANDROIDJAVAENGINE_H__
#define __CDDANDROIDANDROIDJAVAENGINE_H__
#include "audio/include/SimpleAudioEngine.h"
#include "platform/android/jni/JniHelper.h"
@ -67,4 +67,4 @@ namespace CocosDenshion {
}
}
#endif //__CDDANDRIODANDROIDJAVAENGINE_H__
#endif //__CDDANDROIDANDROIDJAVAENGINE_H__

6
cocos/base/CCNS.h
View File

@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __PLATFOMR_CCNS_H__
#define __PLATFOMR_CCNS_H__
#ifndef __PLATFORM_CCNS_H__
#define __PLATFORM_CCNS_H__
#include "math/CCGeometry.h"
@ -76,6 +76,6 @@ Size CC_DLL SizeFromString(const std::string& str);
NS_CC_END
#endif // __PLATFOMR_CCNS_H__
#endif // __PLATFORM_CCNS_H__

2
cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp
View File

@ -372,7 +372,7 @@ namespace ui {
bool conversionResult = cocos2d::StringUtils::UTF16ToUTF8(wstrResult, utf8Result);
if (!conversionResult)
{
CCLOG("warning, editbox input text convertion error.");
CCLOG("warning, editbox input text conversion error.");
}
return std::move(utf8Result);
}