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

GCMemcardDirectory: Move GCIFile class to its own file.

This commit is contained in:
Admiral H. Curtiss 2019-05-17 20:30:08 +02:00
parent 9136abf07e
commit 884af05589
8 changed files with 108 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/CMakeLists.txt
View File

@ -107,6 +107,7 @@ add_library(core
HW/EXI/EXI_DeviceMic.cpp
HW/GCKeyboard.cpp
HW/GCKeyboardEmu.cpp
HW/GCMemcard/GCIFile.cpp
HW/GCMemcard/GCMemcard.cpp
HW/GCMemcard/GCMemcardDirectory.cpp
HW/GCMemcard/GCMemcardRaw.cpp

2
Source/Core/Core/Core.vcxproj
View File

@ -146,6 +146,7 @@
<ClCompile Include="HW\EXI\EXI_DeviceMic.cpp" />
<ClCompile Include="HW\GCKeyboard.cpp" />
<ClCompile Include="HW\GCKeyboardEmu.cpp" />
<ClCompile Include="HW\GCMemcard\GCIFile.cpp" />
<ClCompile Include="HW\GCMemcard\GCMemcard.cpp" />
<ClCompile Include="HW\GCMemcard\GCMemcardDirectory.cpp" />
<ClCompile Include="HW\GCMemcard\GCMemcardRaw.cpp" />
@ -414,6 +415,7 @@
<ClInclude Include="HW\EXI\EXI_DeviceMic.h" />
<ClInclude Include="HW\GCKeyboard.h" />
<ClInclude Include="HW\GCKeyboardEmu.h" />
<ClInclude Include="HW\GCMemcard\GCIFile.h" />
<ClInclude Include="HW\GCMemcard\GCMemcard.h" />
<ClInclude Include="HW\GCMemcard\GCMemcardDirectory.h" />
<ClInclude Include="HW\GCMemcard\GCMemcardRaw.h" />

6
Source/Core/Core/Core.vcxproj.filters
View File

@ -462,6 +462,9 @@
<ClCompile Include="HW\Sram.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\GCMemcard\GCIFile.cpp">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClCompile>
<ClCompile Include="HW\GCMemcard\GCMemcard.cpp">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClCompile>
@ -1173,6 +1176,9 @@
<ClInclude Include="HW\Sram.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\GCMemcard\GCIFile.h">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClInclude>
<ClInclude Include="HW\GCMemcard\GCMemcard.h">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClInclude>

70
Source/Core/Core/HW/GCMemcard/GCIFile.cpp Normal file
View File

@ -0,0 +1,70 @@
// Copyright 2019 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/GCMemcard/GCIFile.h"
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"
bool GCIFile::LoadSaveBlocks()
{
if (m_save_data.empty())
{
if (m_filename.empty())
return false;
File::IOFile save_file(m_filename, "rb");
if (!save_file)
return false;
INFO_LOG(EXPANSIONINTERFACE, "Reading savedata from disk for %s", m_filename.c_str());
save_file.Seek(DENTRY_SIZE, SEEK_SET);
u16 num_blocks = m_gci_header.m_block_count;
m_save_data.resize(num_blocks);
if (!save_file.ReadBytes(m_save_data.data(), num_blocks * BLOCK_SIZE))
{
PanicAlertT("Failed to read data from GCI file %s", m_filename.c_str());
m_save_data.clear();
return false;
}
}
return true;
}
bool GCIFile::HasCopyProtection() const
{
if ((strcmp(reinterpret_cast<const char*>(m_gci_header.m_filename.data()), "PSO_SYSTEM") == 0) ||
(strcmp(reinterpret_cast<const char*>(m_gci_header.m_filename.data()), "PSO3_SYSTEM") == 0) ||
(strcmp(reinterpret_cast<const char*>(m_gci_header.m_filename.data()), "f_zero.dat") == 0))
return true;
return false;
}
int GCIFile::UsesBlock(u16 block_num)
{
for (u16 i = 0; i < m_used_blocks.size(); ++i)
{
if (m_used_blocks[i] == block_num)
return i;
}
return -1;
}
void GCIFile::DoState(PointerWrap& p)
{
p.DoPOD<DEntry>(m_gci_header);
p.Do(m_dirty);
p.Do(m_filename);
int num_blocks = (int)m_save_data.size();
p.Do(num_blocks);
m_save_data.resize(num_blocks);
for (auto itr = m_save_data.begin(); itr != m_save_data.end(); ++itr)
{
p.DoPOD<GCMBlock>(*itr);
}
p.Do(m_used_blocks);
}

28
Source/Core/Core/HW/GCMemcard/GCIFile.h Normal file
View File

@ -0,0 +1,28 @@
// Copyright 2019 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#pragma once
#include <string>
#include <vector>
#include "Common/CommonTypes.h"
#include "Core/HW/GCMemcard/GCMemcard.h"
class PointerWrap;
class GCIFile
{
public:
bool LoadSaveBlocks();
bool HasCopyProtection() const;
void DoState(PointerWrap& p);
int UsesBlock(u16 blocknum);
DEntry m_gci_header;
std::vector<GCMBlock> m_save_data;
std::vector<u16> m_used_blocks;
bool m_dirty;
std::string m_filename;
};

24
Source/Core/Core/HW/GCMemcard/GCMemcard.h
View File

@ -337,30 +337,6 @@ struct BlockAlloc
static_assert(sizeof(BlockAlloc) == BLOCK_SIZE);
#pragma pack(pop)
class GCIFile
{
public:
bool LoadSaveBlocks();
bool HasCopyProtection() const
{
if ((strcmp(reinterpret_cast<const char*>(m_gci_header.m_filename.data()), "PSO_SYSTEM") ==
0) ||
(strcmp(reinterpret_cast<const char*>(m_gci_header.m_filename.data()), "PSO3_SYSTEM") ==
0) ||
(strcmp(reinterpret_cast<const char*>(m_gci_header.m_filename.data()), "f_zero.dat") == 0))
return true;
return false;
}
void DoState(PointerWrap& p);
DEntry m_gci_header;
std::vector<GCMBlock> m_save_data;
std::vector<u16> m_used_blocks;
int UsesBlock(u16 blocknum);
bool m_dirty;
std::string m_filename;
};
class GCMemcard
{
private:

50
Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
View File

@ -693,56 +693,6 @@ void GCMemcardDirectory::DoState(PointerWrap& p)
}
}
bool GCIFile::LoadSaveBlocks()
{
if (m_save_data.empty())
{
if (m_filename.empty())
return false;
File::IOFile save_file(m_filename, "rb");
if (!save_file)
return false;
INFO_LOG(EXPANSIONINTERFACE, "Reading savedata from disk for %s", m_filename.c_str());
save_file.Seek(DENTRY_SIZE, SEEK_SET);
u16 num_blocks = m_gci_header.m_block_count;
m_save_data.resize(num_blocks);
if (!save_file.ReadBytes(m_save_data.data(), num_blocks * BLOCK_SIZE))
{
PanicAlertT("Failed to read data from GCI file %s", m_filename.c_str());
m_save_data.clear();
return false;
}
}
return true;
}
int GCIFile::UsesBlock(u16 block_num)
{
for (u16 i = 0; i < m_used_blocks.size(); ++i)
{
if (m_used_blocks[i] == block_num)
return i;
}
return -1;
}
void GCIFile::DoState(PointerWrap& p)
{
p.DoPOD<DEntry>(m_gci_header);
p.Do(m_dirty);
p.Do(m_filename);
int num_blocks = (int)m_save_data.size();
p.Do(num_blocks);
m_save_data.resize(num_blocks);
for (auto itr = m_save_data.begin(); itr != m_save_data.end(); ++itr)
{
p.DoPOD<GCMBlock>(*itr);
}
p.Do(m_used_blocks);
}
void MigrateFromMemcardFile(const std::string& directory_name, int card_index)
{
File::CreateFullPath(directory_name);

1
Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.h
View File

@ -10,6 +10,7 @@
#include <vector>
#include "Common/Event.h"
#include "Core/HW/GCMemcard/GCIFile.h"
#include "Core/HW/GCMemcard/GCMemcard.h"
// Uncomment this to write the system data of the memorycard from directory to disc