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

win32: [2761959] fixed: 3d options dont stick in other UI languages; also get rid of some dual 3d console spam i accidentally left turned on

This commit is contained in:
zeromus 2009-04-19 18:44:56 +00:00
parent 7a266f75b2
commit 5abdb2faed
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/MMU.cpp
View File

@ -1730,13 +1730,13 @@ void FASTCALL _MMU_ARM9_write16(u32 adr, u16 val)
#endif #endif
if(val & (1<<15)) if(val & (1<<15))
{ {
LOG("Main core on top\n"); //LOG("Main core on top\n");
MainScreen.offset = 0; MainScreen.offset = 0;
SubScreen.offset = 192; SubScreen.offset = 192;
} }
else else
{ {
LOG("Main core on bottom\n"); //LOG("Main core on bottom\n");
MainScreen.offset = 192; MainScreen.offset = 192;
SubScreen.offset = 0; SubScreen.offset = 0;
} }

8
desmume/src/windows/resources.rc
View File

@ -583,10 +583,10 @@ RECENTROMS MENU
// Dialog resources // Dialog resources
// //
LANGUAGE LANG_DANISH, SUBLANG_DANISH_DENMARK LANGUAGE LANG_DANISH, SUBLANG_DANISH_DENMARK
IDD_3DSETTINGS DIALOG 0, 0, 174, 120 IDD_3DSETTINGS DIALOGEX 0, 0, 174, 120
STYLE DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU STYLE DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
CAPTION "3D settings" CAPTION "3D settings"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif", 0, 0, 0
{ {
DEFPUSHBUTTON "OK", IDOK, 62, 92, 50, 14, BS_DEFPUSHBUTTON DEFPUSHBUTTON "OK", IDOK, 62, 92, 50, 14, BS_DEFPUSHBUTTON
PUSHBUTTON "Cancel", IDCANCEL, 117, 92, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 117, 92, 50, 14, BS_PUSHBUTTON
@ -617,10 +617,10 @@ FONT 8, "MS Sans Serif", 0, 0, 0
LANGUAGE LANG_FRENCH, SUBLANG_FRENCH LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
IDD_3DSETTINGS DIALOG 0, 0, 174, 120 IDD_3DSETTINGS DIALOGEX 0, 0, 174, 120
STYLE DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU STYLE DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
CAPTION "Configuration 3D" CAPTION "Configuration 3D"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif", 0, 0, 0
{ {
DEFPUSHBUTTON "OK", IDOK, 62, 92, 50, 14, BS_DEFPUSHBUTTON DEFPUSHBUTTON "OK", IDOK, 62, 92, 50, 14, BS_DEFPUSHBUTTON
PUSHBUTTON "Annuler", IDCANCEL, 117, 92, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL, 117, 92, 50, 14, BS_PUSHBUTTON