archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-22 04:11:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5351 from leoetlino/hack

Browse source 
IOS/ES: Extend the "fake IOSes" hack to netplay/TAS
This commit is contained in:
Léo Lam 2017-05-01 12:18:07 +02:00 committed by GitHub
commit 54dcd3a89b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/Core/IOS/ES/Views.cpp
View file

@ -12,6 +12,7 @@
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/NandPaths.h" #include "Common/NandPaths.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IOS/ES/Formats.h" #include "Core/IOS/ES/Formats.h"
#include "Core/IOS/ES/NandUtils.h" #include "Core/IOS/ES/NandUtils.h"
@ -25,14 +26,18 @@ namespace Device
{ {
// HACK: Since we do not want to require users to install disc updates when launching // HACK: Since we do not want to require users to install disc updates when launching
// Wii games from the game list (which is the inaccurate game boot path anyway), // Wii games from the game list (which is the inaccurate game boot path anyway),
// IOSes have to be faked for games which reload IOS to work properly. // or in TAS/netplay (because forcing every user to have a proper NAND setup in those cases
// is unrealistic), IOSes have to be faked for games and homebrew that reload IOS
// such as Gecko to work properly.
//
// To minimize the effect of this hack, we should only do this for disc titles // To minimize the effect of this hack, we should only do this for disc titles
// booted from the game list, though. // booted from the game list, though.
static bool ShouldReturnFakeViewsForIOSes(u64 title_id, const TitleContext& context) static bool ShouldReturnFakeViewsForIOSes(u64 title_id, const TitleContext& context)
{ {
const bool ios = IsTitleType(title_id, IOS::ES::TitleType::System) && title_id != TITLEID_SYSMENU; const bool ios = IsTitleType(title_id, IOS::ES::TitleType::System) && title_id != TITLEID_SYSMENU;
const bool disc_title = context.active && IOS::ES::IsDiscTitle(context.tmd.GetTitleId()); const bool disc_title = context.active && IOS::ES::IsDiscTitle(context.tmd.GetTitleId());
return ios && SConfig::GetInstance().m_BootType == SConfig::BOOT_ISO && disc_title; return Core::WantsDeterminism() ||
(ios && SConfig::GetInstance().m_BootType == SConfig::BOOT_ISO && disc_title);
} }
IPCCommandResult ES::GetTicketViewCount(const IOCtlVRequest& request) IPCCommandResult ES::GetTicketViewCount(const IOCtlVRequest& request)