piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3108 from lioncash/cstyle-array

Browse Source 
ChunkFile: Provide additional helpers for C-style arrays
This commit is contained in:
flacs
2015-10-01 01:55:54 +02:00
parent 6305437327 a10be26972
commit 696d6eae09
12 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -293,7 +293,7 @@ void DoState(PointerWrap &p)
{
p.DoPOD(m_DISR);
p.DoPOD(m_DICVR);
p.DoArray(m_DICMDBUF, 3);
p.DoArray(m_DICMDBUF);
p.Do(m_DIMAR);
p.Do(m_DILENGTH);
p.Do(m_DICR);

4
Source/Core/Core/HW/VideoInterface.cpp
View File

@ -85,8 +85,8 @@ void DoState(PointerWrap &p)
p.Do(m_XFBInfoBottom);
p.Do(m_3DFBInfoTop);
p.Do(m_3DFBInfoBottom);
p.DoArray(m_InterruptRegister, 4);
p.DoArray(m_LatchRegister, 2);
p.DoArray(m_InterruptRegister);
p.DoArray(m_LatchRegister);
p.Do(m_PictureConfiguration);
p.DoPOD(m_HorizontalScaling);
p.Do(m_FilterCoefTables);

2
Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
View File

@ -591,7 +591,7 @@ void Wiimote::DoState(PointerWrap& p)
p.Do(m_status);
p.Do(m_adpcm_state);
p.Do(m_ext_key);
p.DoArray(m_eeprom, sizeof(m_eeprom));
p.DoArray(m_eeprom);
p.Do(m_reg_motion_plus);
p.Do(m_reg_ir);
p.Do(m_reg_ext);

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
View File

@ -518,7 +518,7 @@ void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
u32 count = size;
while (count > 65536)
{
p.DoArray(&buf[0], 65536);
p.DoArray(buf);
handle.WriteArray(&buf[0], 65536);
count -= 65536;
}
@ -562,7 +562,7 @@ void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
while (count > 65536)
{
handle.ReadArray(&buf[0], 65536);
p.DoArray(&buf[0], 65536);
p.DoArray(buf);
count -= 65536;
}
handle.ReadArray(&buf[0], count);

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View File

@ -131,7 +131,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p)
p.DoPOD(m_HCIEndpoint);
p.DoPOD(m_ACLEndpoint);
p.Do(m_last_ticks);
p.DoArray(m_PacketCount,MAX_BBMOTES);
p.DoArray(m_PacketCount);
p.Do(m_ScanEnable);
p.Do(m_EventQueue);
m_acl_pool.DoState(p);

2
Source/Core/Core/State.cpp
View File

@ -66,7 +66,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system
static const u32 STATE_VERSION = 47; // Last changed in PR 3045
static const u32 STATE_VERSION = 48; // Last changed in PR 3108
// Maps savestate versions to Dolphin versions.
// Versions after 42 don't need to be added to this list,