ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do a better job on the language setting, probably

This commit is contained in:
zeromus 2016-09-08 22:39:31 +00:00
parent ebff84cd45
commit 14458da8f8
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/commandline.cpp
View File

@ -67,7 +67,7 @@ CommandLine::CommandLine()
, start_paused(FALSE)
, autodetect_method(-1)
, render3d(COMMANDLINE_RENDER3D_DEFAULT)
, language(-1)
, language(1) //english by default
{
#ifndef HOST_WINDOWS
disable_sound = 0;
@ -118,7 +118,9 @@ ENDL
" --bios-arm9 BIN_FILE Uses the ARM9 BIOS provided at the specified path" ENDL
" --bios-arm7 BIN_FILE Uses the ARM7 BIOS provided at the specified path" ENDL
" --bios-swi Uses SWI from the provided bios files (else HLE)" ENDL
" --lang N Pick firmware language (can affect game translations)" ENDL
" --lang N Firmware language (can affect game translations)" ENDL
" 0 = Japanese, 1 = English (default), 2 = French" ENDL
" 3 = German, 4 = Italian, 5 = Spanish" ENDL
ENDL
"Arguments affecting contents of SLOT-1:" ENDL
" --slot1 [RETAIL|RETAILAUTO|R4|RETAILNAND|RETAILMCDROM|RETAILDEBUG]" ENDL

4
desmume/src/windows/main.cpp
View File

@ -3383,8 +3383,8 @@ int _main()
}
}
if(cmdline.language != -1)
CommonSettings.fw_config.language = cmdline.language;
//not supported; use the GUI
//if(cmdline.language != -1) CommonSettings.fw_config.language = cmdline.language;
cmdline.process_movieCommands();

9
desmume/src/windows/main.h
View File

@ -57,15 +57,6 @@ extern bool ShowLagFrameCounter;
#define GPU3D_SWRAST 2
#define GPU3D_OPENGL_OLD 3
static const int LANGUAGE_ENGLISH = 0;
static const int LANGUAGE_FRENCH = 1;
static const int LANGUAGE_CHINESE = 3;
static const int LANGUAGE_ITALIAN = 4;
static const int LANGUAGE_JAPANESE = 5;
static const int LANGUAGE_SPANISH = 6;
static const int LANGUAGE_KOREAN = 7;
static const int LANGUAGE_BRAZILIAN = 8;
extern void Change3DCoreWithFallbackAndSave(int newCore);
extern int backupmemorytype;