From 488fc951d04ab94630527d9693ba55e21673f23e Mon Sep 17 00:00:00 2001 From: gocha Date: Sun, 19 Jul 2009 13:07:03 +0000 Subject: [PATCH] Quick fix that should disable autohold while movie playback --- desmume/src/NDSSystem.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp index e0878765f..a6ac86d81 100644 --- a/desmume/src/NDSSystem.cpp +++ b/desmume/src/NDSSystem.cpp @@ -2442,18 +2442,20 @@ void NDS_setPad(bool R,bool L,bool D,bool U,bool T,bool S,bool B,bool A,bool Y,b W=padarray[10]; E=padarray[11]; - if(AutoHold.Right) R=!padarray[0]; - if(AutoHold.Left) L=!padarray[1]; - if(AutoHold.Down) D=!padarray[2]; - if(AutoHold.Up) U=!padarray[3]; - if(AutoHold.Select)T=!padarray[4]; - if(AutoHold.Start) S=!padarray[5]; - if(AutoHold.B) B=!padarray[6]; - if(AutoHold.A) A=!padarray[7]; - if(AutoHold.Y) Y=!padarray[8]; - if(AutoHold.X) X=!padarray[9]; - if(AutoHold.L) W=!padarray[10]; - if(AutoHold.R) E=!padarray[11]; + if (movieMode != MOVIEMODE_PLAY) { + if(AutoHold.Right) R=!padarray[0]; + if(AutoHold.Left) L=!padarray[1]; + if(AutoHold.Down) D=!padarray[2]; + if(AutoHold.Up) U=!padarray[3]; + if(AutoHold.Select)T=!padarray[4]; + if(AutoHold.Start) S=!padarray[5]; + if(AutoHold.B) B=!padarray[6]; + if(AutoHold.A) A=!padarray[7]; + if(AutoHold.Y) Y=!padarray[8]; + if(AutoHold.X) X=!padarray[9]; + if(AutoHold.L) W=!padarray[10]; + if(AutoHold.R) E=!padarray[11]; + } //this macro is the opposite of what you would expect #define FIX(b) (b?0:0x80)