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

Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 

Conflicts:
	tests/test.marmalade/test.mkb
This commit is contained in:
dumganhar 2011-12-15 13:03:07 +08:00
parent a64b81f97b b1cdb6543d
commit 8298e0b6ff
3 changed files with 313 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cocos2dx/platform/marmalade/CCApplication_marmalade.cpp
View File

@ -137,7 +137,47 @@ CCApplication& CCApplication::sharedApplication()
ccLanguageType CCApplication::getCurrentLanguage()
{
return kLanguageEnglish;
int nLanguageIdx;
ccLanguageType currentLanguage;
nLanguageIdx = s3eDeviceGetInt(S3E_DEVICE_LANGUAGE);
switch (nLanguageIdx)
{
case S3E_DEVICE_LANGUAGE_ENGLISH:
currentLanguage = kLanguageEnglish;
break;
case S3E_DEVICE_LANGUAGE_SIMPL_CHINESE:
case S3E_DEVICE_LANGUAGE_TRAD_CHINESE:
currentLanguage = kLanguageChinese;
break;
case S3E_DEVICE_LANGUAGE_FRENCH:
currentLanguage = kLanguageFrench;
break;
case S3E_DEVICE_LANGUAGE_ITALIAN:
currentLanguage = kLanguageItalian;
break;
case S3E_DEVICE_LANGUAGE_GERMAN:
currentLanguage = kLanguageGerman;
break;
case S3E_DEVICE_LANGUAGE_SPANISH:
currentLanguage = kLanguageSpanish;
break;
case S3E_DEVICE_LANGUAGE_RUSSIAN:
currentLanguage = kLanguageItalian;
break;
default:
currentLanguage = kLanguageRussian;
break;
}
return currentLanguage;
}

10
tests/test.marmalade/test.mkb
View File

@ -115,6 +115,11 @@ files
"*.h"
"*.cpp"
[Tests/FontTest]
("../tests/FontTest")
"*.h"
"*.cpp"
[Tests/HiResTest]
("../tests/HiResTest")
"*.h"
@ -135,6 +140,11 @@ files
"*.h"
"*.cpp"
[Tests/CurrentLanguageTest]
("../tests/CurrentLanguageTest")
"*.h"
"*.cpp"
[Tests/MenuTest]
("../tests/MenuTest")
"*.h"

5
tests/tests/controller.cpp
View File

@ -58,8 +58,9 @@ static TestScene* CreateTestScene(int nIdx)
#else
#ifdef MARMALADEUSECHIPMUNK
#if (MARMALADEUSECHIPMUNK == 1)
pScene = new ChipmunkTestScene(); break;
pScene = new ChipmunkTestScene();
#endif
break;
#endif
#endif
case TEST_LABEL:
@ -111,11 +112,11 @@ static TestScene* CreateTestScene(int nIdx)
pScene = new DirectorTestScene(); break;
case TEST_BUGS:
pScene = new BugsTestScene(); break;
#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
case TEST_FONTS:
pScene = new FontTestScene(); break;
case TEST_CURRENT_LANGUAGE:
pScene = new CurrentLanguageTestScene(); break;
#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
case TEST_TEXTURECACHE: pScene = new TextureCacheTestScene(); break;
#endif