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

Movies: Ignore battery save files for Bizhawk/FCEUX movies

Browse source
This commit is contained in:
Sour 2019-11-14 20:15:54 -05:00
parent 48db261942
commit 9752f8ac87
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Core/BizhawkMovie.cpp
View file

@ -6,6 +6,7 @@
#include "BizhawkMovie.h" #include "BizhawkMovie.h"
#include "VsControlManager.h" #include "VsControlManager.h"
#include "Console.h" #include "Console.h"
#include "BatteryManager.h"
#include "NotificationManager.h" #include "NotificationManager.h"
BizhawkMovie::BizhawkMovie(shared_ptr<Console> console) BizhawkMovie::BizhawkMovie(shared_ptr<Console> console)
@ -197,6 +198,7 @@ bool BizhawkMovie::Play(VirtualFile &file)
_console->GetNotificationManager()->RegisterNotificationListener(shared_from_this()); _console->GetNotificationManager()->RegisterNotificationListener(shared_from_this());
_console->GetSettings()->SetRamPowerOnState(RamPowerOnState::AllOnes); _console->GetSettings()->SetRamPowerOnState(RamPowerOnState::AllOnes);
_console->GetBatteryManager()->SetBatteryProvider(shared_from_this());
if(InitializeInputData(reader) && InitializeGameData(reader)) { if(InitializeInputData(reader) && InitializeGameData(reader)) {
//NesHawk initializes memory to 1s //NesHawk initializes memory to 1s
_isPlaying = true; _isPlaying = true;
@ -216,3 +218,8 @@ void BizhawkMovie::ProcessNotification(ConsoleNotificationType type, void* param
_console->GetControlManager()->RegisterInputProvider(this); _console->GetControlManager()->RegisterInputProvider(this);
} }
} }
vector<uint8_t> BizhawkMovie::LoadBattery(string extension)
{
return vector<uint8_t>();
}

4
Core/BizhawkMovie.h
View file

@ -3,11 +3,12 @@
#include "MovieManager.h" #include "MovieManager.h"
#include "../Utilities/ZipReader.h" #include "../Utilities/ZipReader.h"
#include "INotificationListener.h" #include "INotificationListener.h"
#include "BatteryManager.h"
class VirtualFile; class VirtualFile;
class Console; class Console;
class BizhawkMovie : public IMovie, public INotificationListener, public std::enable_shared_from_this<BizhawkMovie> class BizhawkMovie : public IMovie, public INotificationListener, public IBatteryProvider, public std::enable_shared_from_this<BizhawkMovie>
{ {
private: private:
bool InitializeGameData(ZipReader &reader); bool InitializeGameData(ZipReader &reader);
@ -32,4 +33,5 @@ public:
// Inherited via INotificationListener // Inherited via INotificationListener
virtual void ProcessNotification(ConsoleNotificationType type, void * parameter) override; virtual void ProcessNotification(ConsoleNotificationType type, void * parameter) override;
virtual vector<uint8_t> LoadBattery(string extension) override;
}; };

3
Core/FceuxMovie.cpp
View file

@ -34,7 +34,7 @@ bool FceuxMovie::InitializeData(stringstream &filestream)
} }
} else if(line.size() > 0 && line[0] == '|') { } else if(line.size() > 0 && line[0] == '|') {
vector<string> lineData = StringUtilities::Split(line.substr(1), '|'); vector<string> lineData = StringUtilities::Split(line.substr(1), '|');
if(lineData.size() == 0) { if(lineData.size() == 0) {
continue; continue;
} }
@ -68,6 +68,7 @@ bool FceuxMovie::Play(VirtualFile &file)
std::stringstream ss; std::stringstream ss;
file.ReadFile(ss); file.ReadFile(ss);
_console->GetNotificationManager()->RegisterNotificationListener(shared_from_this()); _console->GetNotificationManager()->RegisterNotificationListener(shared_from_this());
_console->GetBatteryManager()->SetBatteryProvider(shared_from_this());
if(InitializeData(ss)) { if(InitializeData(ss)) {
_console->Reset(false); _console->Reset(false);
_isPlaying = true; _isPlaying = true;