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

unintended change and merge issue 

log: revert change that wasn't supposed to be committed
emulator: fix incorrect merge
This commit is contained in:
Flyinghead 2023-02-10 12:56:57 +01:00
parent 5b169b7f9d
commit b5879e6e1d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/emulator.cpp
View File

@ -346,9 +346,9 @@ static void loadSpecialSettings()
INFO_LOG(BOOT, "Enabling specific JVS setup for game %s", prod_id.c_str());
settings.input.JammaSetup = JVS::_18Wheeler;
}
else if (prod_id == "F355 CHALLENGE JAPAN", naomi_game_id)
else if (prod_id == "F355 CHALLENGE JAPAN")
{
INFO_LOG(BOOT, "Enabling specific JVS setup for game %s", naomi_game_id);
INFO_LOG(BOOT, "Enabling specific JVS setup for game %s", prod_id.c_str());
settings.input.JammaSetup = JVS::F355;
}
else if (prod_id == "INU NO OSANPO") // Dog Walking

2
core/log/LogManager.cpp
View File

@ -185,8 +185,6 @@ static std::string GetTimeFormatted()
void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file,
int line, const char* format, va_list args)
{
if (settings.naomi.multiboard && !settings.naomi.slave)
return;
return LogWithFullPath(level, type, file + m_path_cutoff_point, line, format, args);
}