merge master

This commit is contained in:
Nan Wang
2016-05-25 18:35:02 +08:00
2 changed files with 3 additions and 3 deletions
@@ -57,7 +57,7 @@ AndroidJavaEngine::~AndroidJavaEngine()
{
stopAllEffects();
}
JniHelper::callStaticVoidMethod(CLASS_NAME, "destoryAudioEngine");
JniHelper::callStaticVoidMethod(CLASS_NAME, "destroyAudioEngine");
}
void AndroidJavaEngine::preloadBackgroundMusic(const char* filePath) {
@@ -259,7 +259,7 @@ public class Cocos2dxHelper {
sCocosSound.stopAllEffects();
}
public static void destoryAudioEngine() {
public static void destroyAudioEngine() {
if (sCocosMusic != null)
{
sCocosMusic.end();
@@ -273,7 +273,7 @@ public class Cocos2dxHelper {
}
public static void reset() {
destoryAudioEngine();
destroyAudioEngine();
onActivityResultListeners.clear();
if (sAccelerometer != null) {