From 691662f4c9acdf55ed12b8a4246e76ca032fa218 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 14 May 2010 23:51:42 +0000 Subject: [PATCH] Make last commit compile, also replace command comparing methods --- src/movie.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/movie.cpp b/src/movie.cpp index 46a391e1..57cca92d 100644 --- a/src/movie.cpp +++ b/src/movie.cpp @@ -167,8 +167,13 @@ bool MovieRecord::Compare(MovieRecord& compareRec) if (this->joysticks != compareRec.joysticks) return false; - if (this->commands != compareRec.commands) - return false; + //if (this->commands != compareRec.commands) + // return false; + + if(this->command_reset() != compareRec.command_reset()) return false; + if(this->command_power() != compareRec.command_reset()) return false; + if(this->command_fds_insert() != compareRec.command_fds_insert()) return false; + if(this->command_fds_select() != compareRec.command_fds_select()) return false; if (this->zappers[0].x != compareRec.zappers[0].x) return false; if (this->zappers[0].y != compareRec.zappers[0].y) return false; @@ -1264,7 +1269,7 @@ bool FCEUMOV_ReadState(std::istream* is, uint32 size) if(movie_readonly) { - //bool sameTimeline = CheckTimelines(tempMovieData, currMovieData); + bool sameTimeline = true; //= CheckTimelines(tempMovieData, currMovieData); if (sameTimeline) {