mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-26 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

blundered the build

Browse source
This commit is contained in:
Nikhil Narayana 2022-05-30 09:32:18 -07:00
commit afd49eb275
3 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
View file

@ -1732,8 +1732,6 @@ bool CEXISlippi::shouldAdvanceOnlineFrame(s32 frame)
deviation = frameWindowMultiplier * -maxSlowDownAmount; deviation = frameWindowMultiplier * -maxSlowDownAmount;
} }
auto dynamicEmulationSpeed = 1.0f + deviation;
// If we are behind (negative offset) we want to go above 100% run speed, so we need to subtract // If we are behind (negative offset) we want to go above 100% run speed, so we need to subtract
// the deviation value // the deviation value
auto dynamicEmulationSpeed = 1.0f - deviation; auto dynamicEmulationSpeed = 1.0f - deviation;

23
Source/Core/DolphinQt/Settings/GeneralPane.cpp
View file

@ -239,29 +239,6 @@ void GeneralPane::LoadConfig()
m_combobox_fallback_region->setCurrentIndex(FALLBACK_REGION_NTSCJ_INDEX); m_combobox_fallback_region->setCurrentIndex(FALLBACK_REGION_NTSCJ_INDEX);
} }
static QString UpdateTrackFromIndex(int index)
{
QString value;
switch (index)
{
case AUTO_UPDATE_DISABLE_INDEX:
value = QString::fromStdString(AUTO_UPDATE_DISABLE_STRING);
break;
case AUTO_UPDATE_STABLE_INDEX:
value = QString::fromStdString(AUTO_UPDATE_STABLE_STRING);
break;
case AUTO_UPDATE_BETA_INDEX:
value = QString::fromStdString(AUTO_UPDATE_BETA_STRING);
break;
case AUTO_UPDATE_DEV_INDEX:
value = QString::fromStdString(AUTO_UPDATE_DEV_STRING);
break;
}
return value;
}
static DiscIO::Region UpdateFallbackRegionFromIndex(int index) static DiscIO::Region UpdateFallbackRegionFromIndex(int index)
{ {
DiscIO::Region value = DiscIO::Region::Unknown; DiscIO::Region value = DiscIO::Region::Unknown;

1
Source/Core/DolphinQt/Settings/GeneralPane.h
View file

@ -29,7 +29,6 @@ private:
void CreateLayout(); void CreateLayout();
void ConnectLayout(); void ConnectLayout();
void CreateBasic(); void CreateBasic();
void CreateAutoUpdate();
void CreateFallbackRegion(); void CreateFallbackRegion();
void LoadConfig(); void LoadConfig();