diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp index ccc07ea53..8551db797 100644 --- a/desmume/src/commandline.cpp +++ b/desmume/src/commandline.cpp @@ -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 diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index abc51e050..33b1a864b 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -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(); diff --git a/desmume/src/windows/main.h b/desmume/src/windows/main.h index a216cb1d4..d15c32604 100644 --- a/desmume/src/windows/main.h +++ b/desmume/src/windows/main.h @@ -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;