empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed GCC builds

Browse source
This commit is contained in:
Sour 2018-03-24 10:21:11 -04:00
parent b641830058
commit 566a46e21f
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/Console.cpp
View file

@ -132,7 +132,7 @@ bool Console::Initialize(VirtualFile &romFile, VirtualFile &patchFile)
_cpu.reset(new CPU(_memoryManager.get()));
_apu.reset(new APU(_memoryManager.get()));
GameSystem system = _mapper->GetMapperInfo().GameSystem;
GameSystem system = _mapper->GetMapperInfo().System;
switch(system) {
case GameSystem::FDS:
@ -575,7 +575,7 @@ void Console::UpdateNesModel(bool sendNotification)
NesModel model = EmulationSettings::GetNesModel();
if(model == NesModel::Auto) {
switch(_mapper->GetMapperInfo().GameSystem) {
switch(_mapper->GetMapperInfo().System) {
case GameSystem::NesPal: model = NesModel::PAL; break;
case GameSystem::Dendy: model = NesModel::Dendy; break;
default: model = NesModel::NTSC; break;

2
Core/LuaApi.cpp
View file

@ -685,7 +685,7 @@ int LuaApi::GetRomInfo(lua_State *lua)
lua_pushstringvalue(fileSha1Hash, hashInfo.Sha1Hash);
lua_pushintvalue(prgChrCrc32Hash, hashInfo.PrgCrc32Hash);
lua_pushstringvalue(prgChrMd5Hash, hashInfo.PrgChrMd5Hash);
lua_pushintvalue(format, mapperInfo.RomFormat);
lua_pushintvalue(format, mapperInfo.Format);
lua_pushboolvalue(isChrRam, mapperInfo.UsesChrRam);
return 1;
}

2
Core/SaveStateManager.cpp
View file

@ -217,7 +217,7 @@ bool SaveStateManager::LoadState(int stateIndex)
void SaveStateManager::SaveRecentGame(string romName, string romPath, string patchPath)
{
if(!EmulationSettings::CheckFlag(EmulationFlags::ConsoleMode) && !EmulationSettings::CheckFlag(EmulationFlags::DisableGameSelectionScreen) && Console::GetMapperInfo().RomFormat != RomFormat::Nsf) {
if(!EmulationSettings::CheckFlag(EmulationFlags::ConsoleMode) && !EmulationSettings::CheckFlag(EmulationFlags::DisableGameSelectionScreen) && Console::GetMapperInfo().Format != RomFormat::Nsf) {
string filename = FolderUtilities::GetFilename(Console::GetMapperInfo().RomName, false) + ".rgd";
ZipWriter writer;
writer.Initialize(FolderUtilities::CombinePath(FolderUtilities::GetRecentGamesFolder(), filename));

4
Core/Types.h
View file

@ -333,8 +333,8 @@ enum class RomFormat
struct MapperInfo
{
string RomName;
RomFormat RomFormat;
GameSystem GameSystem;
RomFormat Format;
GameSystem System;
uint16_t MapperId;
uint8_t SubMapperId;

2
InteropDLL/ConsoleWrapper.cpp
View file

@ -230,7 +230,7 @@ namespace InteropEmu {
MapperInfo mapperInfo = Console::GetMapperInfo();
romInfo.Crc32 = mapperInfo.Hash.Crc32Hash;
romInfo.PrgCrc32 = mapperInfo.Hash.PrgCrc32Hash;
romInfo.Format = mapperInfo.RomFormat;
romInfo.Format = mapperInfo.Format;
romInfo.IsChrRam = mapperInfo.UsesChrRam;
romInfo.MapperId = mapperInfo.MapperId;
} else {