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

Revert C++11 changes

This commit is contained in:
Pavel Dmytriiev (Github) 2018-08-08 19:14:52 +03:00 committed by Ender's Games
parent 3677e23e1d
commit 88c104580c
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/imgread/common.cpp
View File

@ -31,8 +31,8 @@ struct SenseErrorCode
};
//No disc inserted at the time of power-on, reset or hard reset, or TOC cannot be read.
const SenseErrorCode NoDiskInsertedSenseCode{ 0x29, 0, 6 };
const SenseErrorCode NoErrorSenseCode{ 0, 0, 0 };
const SenseErrorCode NoDiskInsertedSenseCode = { 0x29, 0, 6 };
const SenseErrorCode NoErrorSenseCode = { 0, 0, 0 };
void SetSnsCodes(const SenseErrorCode& errorCode)
{
@ -207,17 +207,14 @@ bool InitDrive(u32 fileflags/*=0*/)
return true;
}
std::string diskImageFileName{ settings.imgread.LastImage };
std::string diskImageFileName = settings.imgread.LastImage;
#ifdef BUILD_DREAMCAST
int gfrv = GetFile(diskImageFileName);
int returnCode = GetFile(diskImageFileName);
if (!returnCode)
return false;
#else
int gfrv = rv_error;
int returnCode = rv_error;
#endif
if (gfrv != rv_ok)
{
return false;
}
settings.imgread.LastImage = diskImageFileName;
SaveSettings();