summaryrefslogtreecommitdiffstats
path: root/mbbsd
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2007-11-30 17:53:27 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2007-11-30 17:53:27 +0800
commit9512a651894b9f41d9d93284c2252c1134dc783c (patch)
tree56c86370ed7dba95e1ad309bfeb79f22b28706fe /mbbsd
parentc54b44f944557d07646bab06f8c350849540b740 (diff)
downloadpttbbs-9512a651894b9f41d9d93284c2252c1134dc783c.tar
pttbbs-9512a651894b9f41d9d93284c2252c1134dc783c.tar.gz
pttbbs-9512a651894b9f41d9d93284c2252c1134dc783c.tar.bz2
pttbbs-9512a651894b9f41d9d93284c2252c1134dc783c.tar.lz
pttbbs-9512a651894b9f41d9d93284c2252c1134dc783c.tar.xz
pttbbs-9512a651894b9f41d9d93284c2252c1134dc783c.tar.zst
pttbbs-9512a651894b9f41d9d93284c2252c1134dc783c.zip
- 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
Diffstat (limited to 'mbbsd')
-rw-r--r--mbbsd/pmore.c13
1 files changed, 12 insertions, 1 deletions
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);