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

movie.cpp/movie.h: Fix compiling issues for old GCC 4.2, which doesn't allow for variable initialization in C++ class declarations. (Regression from commit e83ec89.)

This commit is contained in:
rogerman 2018-10-22 11:38:06 -07:00
parent 94ddf1a467
commit 68174fb31f
2 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
desmume/src/movie.cpp
View File

@ -208,6 +208,23 @@ MovieData::MovieData(bool fromCurrentSettings)
, binaryFlag(false)
, rtcStart(FCEUI_MovieGetRTCDefault())
{
savestate = false;
useExtBios = -1;
swiFromBios = -1;
useExtFirmware = -1;
bootFromFirmware = -1;
firmNickname = "";
firmMessage = "";
firmFavColour = -1;
firmBirthMonth = -1;
firmBirthDay = -1;
firmLanguage = -1;
advancedTiming = -1;
jitBlockSize = -1;
installValueMap["version"] = &MovieData::installVersion;
installValueMap["emuVersion"] = &MovieData::installEmuVersion;
installValueMap["rerecordCount"] = &MovieData::installRerecordCount;
@ -904,8 +921,8 @@ static void FCEUMOV_AddCommand(int cmd)
}
//little endian 4-byte cookies
static const int kMOVI = 0x49564F4D;
static const int kNOMO = 0x4F4D4F4E;
static const u32 kMOVI = 0x49564F4D;
static const u32 kNOMO = 0x4F4D4F4E;
void mov_savestate(EMUFILE &fp)
{

40
desmume/src/movie.h
View File

@ -44,13 +44,13 @@ typedef struct
std::vector<std::wstring> comments;
std::vector<std::string> subtitles;
} MOVIE_INFO;
enum START_FROM
{
START_BLANK = 0,
START_SRAM,
START_SAVESTATE
} MOVIE_INFO;
enum START_FROM
{
START_BLANK = 0,
START_SRAM,
START_SAVESTATE
};
enum EMOVIEMODE
@ -149,7 +149,7 @@ public:
u32 romChecksum;
std::string romSerial;
std::string romFilename;
bool savestate = false;
bool savestate;
std::vector<u8> sram;
std::vector<MovieRecord> records;
std::vector<std::wstring> comments;
@ -162,20 +162,20 @@ public:
//was the frame data stored in binary?
bool binaryFlag;
int useExtBios = -1;
int swiFromBios = -1;
int useExtFirmware = -1;
int bootFromFirmware = -1;
int useExtBios;
int swiFromBios;
int useExtFirmware;
int bootFromFirmware;
std::string firmNickname = "";
std::string firmMessage = "";
int firmFavColour = -1;
int firmBirthMonth = -1;
int firmBirthDay = -1;
int firmLanguage = -1;
std::string firmNickname;
std::string firmMessage;
int firmFavColour;
int firmBirthMonth;
int firmBirthDay;
int firmLanguage;
int advancedTiming = -1;
int jitBlockSize = -1;
int advancedTiming;
int jitBlockSize;
int getNumRecords() { return records.size(); }