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

Add swiFromBios and bootFromFirmware to MovieData.

This commit is contained in:
SuuperW 2018-09-02 10:52:35 -05:00
parent 11e2448d1c
commit 484b062bf5
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
desmume/src/movie.cpp
View File

@ -210,8 +210,11 @@ MovieData::MovieData(bool fromCurrentSettings)
if (fromCurrentSettings) if (fromCurrentSettings)
{ {
useExtBios = CommonSettings.UseExtBIOS; useExtBios = CommonSettings.UseExtBIOS;
if (useExtFirmware != -1) if (useExtBios)
useExtFirmware = CommonSettings.UseExtFirmware; swiFromBios = CommonSettings.SWIFromBIOS;
useExtFirmware = CommonSettings.UseExtFirmware;
if (useExtFirmware)
bootFromFirmware = CommonSettings.BootFromFirmware;
if (!CommonSettings.UseExtFirmware) if (!CommonSettings.UseExtFirmware)
{ {
firmNickname.resize(CommonSettings.fw_config.nickname_len); firmNickname.resize(CommonSettings.fw_config.nickname_len);
@ -516,8 +519,12 @@ static void LoadSettingsFromMovie(MovieData movieData)
{ {
if (movieData.useExtBios != -1) if (movieData.useExtBios != -1)
CommonSettings.UseExtBIOS = movieData.useExtBios; CommonSettings.UseExtBIOS = movieData.useExtBios;
if (movieData.swiFromBios != -1)
CommonSettings.SWIFromBIOS = movieData.swiFromBios;
if (movieData.useExtFirmware != -1) if (movieData.useExtFirmware != -1)
CommonSettings.UseExtFirmware = movieData.useExtFirmware; CommonSettings.UseExtFirmware = movieData.useExtFirmware;
if (movieData.bootFromFirmware != -1)
CommonSettings.BootFromFirmware = movieData.bootFromFirmware;
if (!CommonSettings.UseExtFirmware) if (!CommonSettings.UseExtFirmware)
{ {
if (movieData.firmNickname != "") if (movieData.firmNickname != "")

8
desmume/src/movie.h
View File

@ -155,7 +155,9 @@ public:
bool binaryFlag; bool binaryFlag;
int useExtBios = -1; int useExtBios = -1;
int swiFromBios = -1;
int useExtFirmware = -1; int useExtFirmware = -1;
int bootFromFirmware = -1;
std::string firmNickname = ""; std::string firmNickname = "";
std::string firmMessage = ""; std::string firmMessage = "";
@ -219,7 +221,9 @@ private:
void installRtcStartNew(std::string& val) { DateTime::TryParse(val.c_str(), rtcStart); } void installRtcStartNew(std::string& val) { DateTime::TryParse(val.c_str(), rtcStart); }
void installBinary(std::string& val) { binaryFlag = atoi(val.c_str()) != 0; } void installBinary(std::string& val) { binaryFlag = atoi(val.c_str()) != 0; }
void installUseExtBios(std::string& val) { useExtBios = atoi(val.c_str()) != 0; } void installUseExtBios(std::string& val) { useExtBios = atoi(val.c_str()) != 0; }
void installSwiFromBios(std::string& val) { swiFromBios = atoi(val.c_str()) != 0; }
void installUseExtFirmware(std::string& val) { useExtFirmware = atoi(val.c_str()) != 0; } void installUseExtFirmware(std::string& val) { useExtFirmware = atoi(val.c_str()) != 0; }
void installBootFromFirmware(std::string& val) { bootFromFirmware = atoi(val.c_str()) != 0; }
void installFirmNickname(std::string& val) { firmNickname = val; } void installFirmNickname(std::string& val) { firmNickname = val; }
void installFirmMessage(std::string& val) { firmMessage = val; } void installFirmMessage(std::string& val) { firmMessage = val; }
void installFirmFavColour(std::string& val) { firmFavColour = atoi(val.c_str()); } void installFirmFavColour(std::string& val) { firmFavColour = atoi(val.c_str()); }
@ -249,7 +253,9 @@ private:
{"comment", &MovieData::installComment}, {"comment", &MovieData::installComment},
{"binary", &MovieData::installBinary}, {"binary", &MovieData::installBinary},
{"useExtBios", &MovieData::installUseExtBios}, {"useExtBios", &MovieData::installUseExtBios},
{"useExtFirmware", &MovieData::installUseExtBios}, {"swiFromBios", &MovieData::installSwiFromBios},
{"useExtFirmware", &MovieData::installUseExtFirmware},
{"bootFromFirmware", &MovieData::installBootFromFirmware},
{"firmNickname", &MovieData::installFirmNickname}, {"firmNickname", &MovieData::installFirmNickname},
{"firmMessage", &MovieData::installFirmMessage}, {"firmMessage", &MovieData::installFirmMessage},
{"firmFavColour", &MovieData::installFirmFavColour}, {"firmFavColour", &MovieData::installFirmFavColour},