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

Merge pull request #3166 from Tilka/wiimote_state 

Wiimote: simplify DoState() parameters
This commit is contained in:
flacs 2015-10-12 05:21:21 +02:00
parent c8382cca83 ae999cb43c
commit 4467c762d7
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/ChunkFile.h
View File

@ -70,7 +70,6 @@ public:
void SetMode(Mode mode_) { mode = mode_; } void SetMode(Mode mode_) { mode = mode_; }
Mode GetMode() const { return mode; } Mode GetMode() const { return mode; }
u8** GetPPtr() { return ptr; }
template <typename K, class V> template <typename K, class V>
void Do(std::map<K, V>& x) void Do(std::map<K, V>& x)

3
Source/Core/Core/HW/Wiimote.cpp
View File

@ -153,11 +153,10 @@ unsigned int GetAttached()
// input/output: ptr: [Description Needed] // input/output: ptr: [Description Needed]
// input: mode [Description needed] // input: mode [Description needed]
// //
void DoState(u8 **ptr, PointerWrap::Mode mode) void DoState(PointerWrap& p)
{ {
// TODO: // TODO:
PointerWrap p(ptr, mode);
for (unsigned int i=0; i<MAX_BBMOTES; ++i) for (unsigned int i=0; i<MAX_BBMOTES; ++i)
((WiimoteEmu::Wiimote*)s_config.controllers[i])->DoState(p); ((WiimoteEmu::Wiimote*)s_config.controllers[i])->DoState(p);
} }

2
Source/Core/Core/HW/Wiimote.h
View File

@ -42,7 +42,7 @@ void Resume();
void Pause(); void Pause();
unsigned int GetAttached(); unsigned int GetAttached();
void DoState(u8 **ptr, PointerWrap::Mode mode); void DoState(PointerWrap& p);
void EmuStateChange(EMUSTATE_CHANGE newState); void EmuStateChange(EMUSTATE_CHANGE newState);
InputConfig* GetConfig(); InputConfig* GetConfig();

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

@ -164,7 +164,7 @@ static std::string DoState(PointerWrap& p)
p.DoMarker("video_backend"); p.DoMarker("video_backend");
if (SConfig::GetInstance().bWii) if (SConfig::GetInstance().bWii)
Wiimote::DoState(p.GetPPtr(), p.GetMode()); Wiimote::DoState(p);
p.DoMarker("Wiimote"); p.DoMarker("Wiimote");
PowerPC::DoState(p); PowerPC::DoState(p);