diff --git a/src/gapi/c3d.h b/src/gapi/c3d.h index 8f1be38..c0daea5 100644 --- a/src/gapi/c3d.h +++ b/src/gapi/c3d.h @@ -511,6 +511,11 @@ namespace GAPI { ret = C3D_TexInitWithParams(&tex, &texCube, params); } + if (width != origWidth || height != origHeight) { + uint32 texSize = C3D_TexCalcTotalSize(tex.size, tex.maxLevel); + memset(tex.data, 0, texSize); + } + ASSERT(ret); mmLogVRAM(); diff --git a/src/platform/3ds/deploy.bat b/src/platform/3ds/deploy.bat deleted file mode 100644 index 38c128a..0000000 --- a/src/platform/3ds/deploy.bat +++ /dev/null @@ -1 +0,0 @@ -C:\devkitPro\tools\bin\3dslink.exe OpenLara.3dsx -a 192.168.1.63 \ No newline at end of file diff --git a/src/platform/3ds/deploy.sh b/src/platform/3ds/deploy.sh new file mode 100644 index 0000000..d90c662 --- /dev/null +++ b/src/platform/3ds/deploy.sh @@ -0,0 +1,2 @@ +make +/C/devkitPro/tools/bin/3dslink.exe OpenLara.3dsx -a 192.168.1.68 diff --git a/src/platform/3ds/main.cpp b/src/platform/3ds/main.cpp index 131c898..911e5ae 100644 --- a/src/platform/3ds/main.cpp +++ b/src/platform/3ds/main.cpp @@ -175,7 +175,30 @@ void sndFree() { linearFree((uint32*)sndBuffer); } +int checkLanguage() +{ + uint8 id; + CFGU_GetSystemLanguage(&id); + + int str = STR_LANG_EN; + switch (id) + { + case CFG_LANGUAGE_EN : str = STR_LANG_EN; break; + case CFG_LANGUAGE_FR : str = STR_LANG_FR; break; + case CFG_LANGUAGE_DE : str = STR_LANG_DE; break; + case CFG_LANGUAGE_ES : str = STR_LANG_ES; break; + case CFG_LANGUAGE_IT : str = STR_LANG_IT; break; + case CFG_LANGUAGE_PT : str = STR_LANG_PT; break; + case CFG_LANGUAGE_RU : str = STR_LANG_RU; break; + case CFG_LANGUAGE_JP : str = STR_LANG_JA; break; + case CFG_LANGUAGE_ZH : str = STR_LANG_CN; break; + } + return str - STR_LANG_EN; +} + int main() { + cfguInit(); + setBottomScreen(false); { @@ -191,6 +214,8 @@ int main() { strcpy(contentDir, "sdmc:/3ds/OpenLara/"); Stream::init(); + + Core::defLang = checkLanguage(); sndInit(); inputInit();