From 5317608340f8416ba50ada8d86bc0402d6d086c4 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 2 May 2009 18:40:42 +0000 Subject: [PATCH] remove 'MOVI' and 'NOMO' --- desmume/src/movie.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp index 397a9f56e..e4dd0ab88 100644 --- a/desmume/src/movie.cpp +++ b/desmume/src/movie.cpp @@ -608,6 +608,9 @@ static void FCEUMOV_AddCommand(int cmd) //DoEncode((cmd>>3)&0x3,cmd&0x7,1); } +//little endian 4-byte cookies +static const int kMOVI = 0x49564F4D; +static const int kNOMO = 0x4F4D4F4E; void mov_savestate(std::ostream* os) { @@ -617,12 +620,12 @@ void mov_savestate(std::ostream* os) //else return 0; if(movieMode == MOVIEMODE_RECORD || movieMode == MOVIEMODE_PLAY) { - write32le('MOVI',os); + write32le(kMOVI,os); currMovieData.dump(os, true); } else { - write32le('NOMO',os); + write32le(kNOMO,os); } } @@ -636,9 +639,9 @@ bool mov_loadstate(std::istream* is, int size) int cookie; if(read32le(&cookie,is) != 1) return false; - if(cookie == 'NOMO') + if(cookie == kNOMO) return true; - else if(cookie != 'MOVI') + else if(cookie != kMOVI) return false; size -= 4;