Skip to content

Commit

Permalink
Correct a small bug in metamove animation.
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
ostrosablin committed Mar 10, 2023
1 parent c9a7514 commit e1d0f91
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
1.2.6 Correct a bug in metamove animation implementation.

1.2.5 Add support for multiselecting cards in column by repeatedly pressing
column key, rather only with vi-style number prefixes. Each press will
add one more card to selection if next card is in correct order.
Expand Down
8 changes: 4 additions & 4 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for freecell 1.2.5.
# Generated by GNU Autoconf 2.61 for freecell 1.2.6.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='freecell'
PACKAGE_TARNAME='freecell'
PACKAGE_VERSION='1.2.5'
PACKAGE_STRING='freecell 1.2.5'
PACKAGE_VERSION='1.2.6'
PACKAGE_STRING='freecell 1.2.6'
PACKAGE_BUGREPORT='[email protected]'

ac_default_prefix=/usr/games
Expand Down Expand Up @@ -2062,7 +2062,7 @@ fi
# Define the identity of the package.
PACKAGE='freecell'
VERSION='1.2.5'
VERSION='1.2.6'
cat >>confdefs.h <<_ACEOF
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

# AC_PREREQ(2.61)
AC_INIT([freecell],[1.2.5],[[email protected]])
AC_INIT([freecell],[1.2.6],[[email protected]])

AM_INIT_AUTOMAKE

Expand Down
2 changes: 1 addition & 1 deletion src/freecell.c
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ void metamove(struct column *scol, int seln, struct column *dcol, int *freecells

if (!scol->ncard) {
for(int i = 0; i < 8; i++) {
if(&column[i] == dcol) {
if(&column[i] == scol) {
freecolumns |= (1 << i);
break;
}
Expand Down

0 comments on commit e1d0f91

Please sign in to comment.