[ace-of-penguins] 01/04: Imported Upstream version 1.5~rc2

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository ace-of-penguins.

commit a73c1b7657abda3f189c22a29eaee857e20d7f3c
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jan 19 20:40:53 2016 +0100

    Imported Upstream version 1.5~rc2
---
 ChangeLog        |  5 +++++
 games/.cvsignore | 17 -----------------
 games/spider.c   | 17 +++++++++--------
 lib/.cvsignore   |  9 ---------
 tests/.cvsignore | 10 ----------
 5 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0d66126..47f4363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-19  Esa Peuha  <esa.peuha at gmail.com>
+
+	* games/spider.c: Revert 1.11 from 2015-06-03 to fix games
+	  with 2 or 4 suits.
+
 2015-06-12  Esa Peuha  <esa.peuha at gmail.com>
 
 	* .cvsignore, games/.cvsignore, lib/.cvsignore, tests/.cvsignore:
diff --git a/games/.cvsignore b/games/.cvsignore
deleted file mode 100644
index 21a78c2..0000000
--- a/games/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-.deps
-.libs
-Makefile
-*-help.c
-*-img.c
-canfield
-freecell
-golf
-mastermind
-merlin
-minesweeper
-pegged
-solitaire
-spider
-taipedit
-taipei
-thornq
diff --git a/games/spider.c b/games/spider.c
index a0a8e4a..b56a79c 100644
--- a/games/spider.c
+++ b/games/spider.c
@@ -46,14 +46,20 @@ static int ax, adx, ay, ady;
 static void
 start_again()
 {
-  int i;
+  int i, d, s, v;
 
   clear_arrows();
 
   for (i=0; i<8; i++)
     stack_flip_stack(outcells[i], deck, 0);
   for (i=0; i<10; i++)
-    stack_flip_move_stack(maincells[i], deck, 0);
+    stack_flip_stack(maincells[i], deck, 0);
+
+  while(stack_take_card(deck) != -1);
+  for (d=0; d<2; d++)
+    for (s=0; s<4; s++)
+      for (v=ACE; v<=KING; v++)
+	stack_add_card(deck, MAKE_CARD(s & suit_mask, v, FACEDOWN));
 
   stack_shuffle(deck);
   stack_shuffle(deck);
@@ -73,7 +79,7 @@ start_again()
 static void
 init()
 {
-  int d, s, v;
+  int s;
   Picture *empty;
 
   stack_load_standard_deck();
@@ -93,11 +99,6 @@ init()
 
   deck = stack_create(M, M);
 
-  for (d=0; d<2; d++)
-    for (s=0; s<4; s++)
-      for (v=ACE; v<=KING; v++)
-	stack_add_card(deck, MAKE_CARD(s & suit_mask, v, FACEDOWN));
-
   start_again();
 }
 
diff --git a/lib/.cvsignore b/lib/.cvsignore
deleted file mode 100644
index 93fa9f7..0000000
--- a/lib/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-Makefile
-images.c
-images.d
-*.lo
-libcards.la
-make-imglib
-text2c
diff --git a/tests/.cvsignore b/tests/.cvsignore
deleted file mode 100644
index f8c5bc5..0000000
--- a/tests/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-test6c.c
-penguins
-test1
-test3
-test4
-test5
-test6

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ace-of-penguins.git