Skip to content

Commit e1d0f91

Browse files
committed
Correct a small bug in metamove animation.
We were marking wrong column as free, which sometimes leads to incorrect unwinding of intermediate moves. Obviously, this should have marked freed (source) column as free, not the destination column. Signed-off-by: Vitaly Ostrosablin <tmp6154@yandex.ru>
1 parent c9a7514 commit e1d0f91

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
1.2.6 Correct a bug in metamove animation implementation.
2+
13
1.2.5 Add support for multiselecting cards in column by repeatedly pressing
24
column key, rather only with vi-style number prefixes. Each press will
35
add one more card to selection if next card is in correct order.

configure

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.61 for freecell 1.2.5.
3+
# Generated by GNU Autoconf 2.61 for freecell 1.2.6.
44
#
55
# Report bugs to <linus@linusakesson.net>.
66
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
574574
# Identity of this package.
575575
PACKAGE_NAME='freecell'
576576
PACKAGE_TARNAME='freecell'
577-
PACKAGE_VERSION='1.2.5'
578-
PACKAGE_STRING='freecell 1.2.5'
577+
PACKAGE_VERSION='1.2.6'
578+
PACKAGE_STRING='freecell 1.2.6'
579579
PACKAGE_BUGREPORT='tmp6154@yandex.ru'
580580

581581
ac_default_prefix=/usr/games
@@ -2062,7 +2062,7 @@ fi
20622062
20632063
# Define the identity of the package.
20642064
PACKAGE='freecell'
2065-
VERSION='1.2.5'
2065+
VERSION='1.2.6'
20662066
20672067
20682068
cat >>confdefs.h <<_ACEOF

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
# AC_PREREQ(2.61)
5-
AC_INIT([freecell],[1.2.5],[tmp6154@yandex.ru])
5+
AC_INIT([freecell],[1.2.6],[tmp6154@yandex.ru])
66

77
AM_INIT_AUTOMAKE
88

src/freecell.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ void metamove(struct column *scol, int seln, struct column *dcol, int *freecells
616616

617617
if (!scol->ncard) {
618618
for(int i = 0; i < 8; i++) {
619-
if(&column[i] == dcol) {
619+
if(&column[i] == scol) {
620620
freecolumns |= (1 << i);
621621
break;
622622
}

0 commit comments

Comments
 (0)