From 9512a651894b9f41d9d93284c2252c1134dc783c Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Fri, 30 Nov 2007 09:53:27 +0000
Subject: - pmore: fix continue offset-by-one in K## - pmore: unmask keys in
 options interation

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3595 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/pmore.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'mbbsd')

diff --git a/mbbsd/pmore.c b/mbbsd/pmore.c
index 59066e68..0ff07c3a 100644
--- a/mbbsd/pmore.c
+++ b/mbbsd/pmore.c
@@ -2931,8 +2931,14 @@ mf_movieOptionHandler(unsigned char *opt, unsigned char *end)
 	if (optclk > 0)
 	{
 	    // timed interaction
+
+	    // disable optkeys to allow masked input
+	    unsigned char *tmpopt = mfmovie.optkeys;
+	    mfmovie.optkeys = NULL;
+
 	    mf_float2tv(optclk, &tv);
 	    c = pmore_wait_key(&tv, 1);
+	    mfmovie.optkeys = tmpopt;
 
 	    // if timeout, drop.
 	    if (!c)
@@ -3087,7 +3093,12 @@ mf_movieProcessCommand(unsigned char *p, unsigned char *end)
 		while (p < end && *p != '\n' && *p != '#')
 		    p++;
 
-		if (*p == '#') p++;
+		if (*p == '#') 
+		{
+		    p++;
+		}
+		// continue will increase p
+		p--;
 		continue;
 	    }
 	    MOVIECMD_SKIP_ALL(p,end);
-- 
cgit v1.2.3