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

Merge branch 'master' into fatfs_mkII

This commit is contained in:
Arisotura 2021-10-28 18:03:25 +02:00 committed by GitHub
parent 53a36781cf a8613af2bd
commit cb018889e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Config.cpp
View File

@ -32,8 +32,14 @@ int ExternalBIOSEnable;
char BIOS9Path[1024]; char BIOS9Path[1024];
char BIOS7Path[1024]; char BIOS7Path[1024];
char FirmwarePath[1024]; char FirmwarePath[1024];
//int DLDIEnable;
//char DLDISDPath[1024]; char FirmwareUsername[64];
int FirmwareLanguage;
bool FirmwareOverrideSettings;
int FirmwareBirthdayMonth;
int FirmwareBirthdayDay;
int FirmwareFavouriteColour;
char FirmwareMessage[1024];
char FirmwareUsername[64]; char FirmwareUsername[64];
int FirmwareLanguage; int FirmwareLanguage;
@ -47,8 +53,6 @@ char DSiBIOS9Path[1024];
char DSiBIOS7Path[1024]; char DSiBIOS7Path[1024];
char DSiFirmwarePath[1024]; char DSiFirmwarePath[1024];
char DSiNANDPath[1024]; char DSiNANDPath[1024];
//int DSiSDEnable;
//char DSiSDPath[1024];
int RandomizeMAC; int RandomizeMAC;
int AudioBitrate; int AudioBitrate;

8
src/Config.h
View File

@ -54,6 +54,14 @@ extern int FirmwareBirthdayDay;
extern int FirmwareFavouriteColour; extern int FirmwareFavouriteColour;
extern char FirmwareMessage[1024]; extern char FirmwareMessage[1024];
extern char FirmwareUsername[64];
extern int FirmwareLanguage;
extern bool FirmwareOverrideSettings;
extern int FirmwareBirthdayMonth;
extern int FirmwareBirthdayDay;
extern int FirmwareFavouriteColour;
extern char FirmwareMessage[1024];
extern char DSiBIOS9Path[1024]; extern char DSiBIOS9Path[1024];
extern char DSiBIOS7Path[1024]; extern char DSiBIOS7Path[1024];
extern char DSiFirmwarePath[1024]; extern char DSiFirmwarePath[1024];

2
src/frontend/qt_sdl/EmuSettingsDialog.ui
View File

@ -26,7 +26,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">