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

Code cleanup

Browse source
This commit is contained in:
Souryo 2014-07-10 19:30:22 -04:00
parent f55b9fce60
commit 3cc3bf6cbd
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Core/ROMLoader.h
View file

@ -61,12 +61,8 @@ class ROMLoader
{
bool result = false;
zipFile.seekg(0, ios::end);
uint32_t fileSize = (uint32_t)zipFile.tellg();
zipFile.seekg(0, ios::beg);
uint8_t* buffer = new uint8_t[fileSize];
zipFile.read((char*)buffer, fileSize);
uint32_t fileSize;
uint8_t* buffer = ReadFile(zipFile, fileSize);
ZIPReader reader;
reader.LoadZIPArchive(buffer, fileSize);
@ -95,18 +91,32 @@ class ROMLoader
bool LoadFromFile(ifstream &romFile)
{
romFile.seekg(0, ios::end);
uint32_t fileSize = (uint32_t)romFile.tellg();
romFile.seekg(0, ios::beg);
uint8_t* buffer = new uint8_t[fileSize];
romFile.read((char*)buffer, fileSize);
uint32_t fileSize;
uint8_t* buffer = ReadFile(romFile, fileSize);
bool result = LoadFromMemory(buffer, fileSize);
delete[] buffer;
return result;
}
uint32_t GetFileSize(ifstream &file)
{
file.seekg(0, ios::end);
uint32_t fileSize = (uint32_t)file.tellg();
file.seekg(0, ios::beg);
return fileSize;
}
uint8_t* ReadFile(ifstream &file, uint32_t &fileSize)
{
fileSize = GetFileSize(file);
uint8_t* buffer = new uint8_t[fileSize];
file.read((char*)buffer, fileSize);
return buffer;
}
bool LoadFromMemory(uint8_t* buffer, uint32_t length)
{
if(memcmp(buffer, "NES", 3) == 0) {