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

oh god git what are you doing

This commit is contained in:
Arisotura 2022-09-25 22:00:53 +02:00
parent 2f1664a5ae d0f60e43f3
commit 98f45b72ab
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/frontend/qt_sdl/Config.cpp
View File

@ -317,6 +317,7 @@ ConfigEntry ConfigFile[] =
{"DSBatteryLevelOkay", 1, &DSBatteryLevelOkay, true, true}, {"DSBatteryLevelOkay", 1, &DSBatteryLevelOkay, true, true},
{"DSiBatteryLevel", 0, &DSiBatteryLevel, 0xF, true}, {"DSiBatteryLevel", 0, &DSiBatteryLevel, 0xF, true},
{"DSiBatteryCharging", 1, &DSiBatteryCharging, true, true}, {"DSiBatteryCharging", 1, &DSiBatteryCharging, true, true},
// TODO!! // TODO!!
// we need a more elegant way to deal with this // we need a more elegant way to deal with this
{"Camera0_InputType", 0, &Camera[0].InputType, 0, false}, {"Camera0_InputType", 0, &Camera[0].InputType, 0, false},

8
src/frontend/qt_sdl/Config.h
View File

@ -69,6 +69,14 @@ struct CameraConfig
bool XFlip; bool XFlip;
}; };
struct CameraConfig
{
int InputType; // 0=blank 1=image 2=camera
std::string ImagePath;
std::string CamDeviceName;
bool XFlip;
};
extern int KeyMapping[12]; extern int KeyMapping[12];
extern int JoyMapping[12]; extern int JoyMapping[12];

1
src/frontend/qt_sdl/Platform.cpp
View File

@ -496,7 +496,6 @@ u16 MP_RecvReplies(u8* data, u64 timestamp, u16 aidmask)
return LocalMP::RecvReplies(data, timestamp, aidmask); return LocalMP::RecvReplies(data, timestamp, aidmask);
} }
bool LAN_Init() bool LAN_Init()
{ {
if (Config::DirectLAN) if (Config::DirectLAN)