diff options
| author | Yves Combe <ycombe@src.gnome.org> | 2006-03-05 21:59:20 (GMT) |
|---|---|---|
| committer | Yves Combe <ycombe@src.gnome.org> | 2006-03-05 21:59:20 (GMT) |
| commit | 3e5b77cacf5349eeec1d109be6d28788dee03298 (patch) | |
| tree | adab097b601bd3d0be38e60a75a423da6319c9e9 | |
| parent | 4c5fcd3118b4614713c73c3f456b49cf7ab46598 (diff) | |
fix tux mode playing already played cards.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/boards/memory.c | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2006-03-05 Yves Combe <yves@ycombe.net> + + fix tux mode playing already played cards. + + * src/boards/memory.c: (display_card), (hide_card): + 2006-03-05 Bruno coudoin <bruno.coudoin@free.fr> translation file list cleanup. diff --git a/src/boards/memory.c b/src/boards/memory.c index 8b63ef2..fdffec9 100644 --- a/src/boards/memory.c +++ b/src/boards/memory.c @@ -1,6 +1,6 @@ /* gcompris - memory.c * - * Time-stamp: <2006/02/09 07:58:04 yves> + * Time-stamp: <2006/03/05 22:43:29 yves> * * Copyright (C) 2000 Bruno Coudoin * @@ -1373,6 +1373,7 @@ static void display_card(MemoryItem *memoryItem, CardStatus cardStatus) switch (cardStatus) { case ON_FRONT: + g_assert(memoryItem->hidden == FALSE); gnome_canvas_item_hide(memoryItem->backcardItem); gnome_canvas_item_show(memoryItem->frontcardItem); playing_sound = TRUE; @@ -1393,6 +1394,7 @@ static void display_card(MemoryItem *memoryItem, CardStatus cardStatus) switch (cardStatus) { case ON_FRONT: + g_assert(memoryItem->hidden == FALSE); gnome_canvas_item_hide(memoryItem->backcardItem); gnome_canvas_item_show(memoryItem->framecardItem); gnome_canvas_item_show(memoryItem->frontcardItem); @@ -1424,7 +1426,7 @@ static gint hide_card (GtkWidget *widget, gpointer data) GList *to_remove = NULL; for (list = winning_pairs; list != NULL; list=list->next) - if ((((WINNING *) list->data)->first == firstCard) || (((WINNING *) list->data)->first == secondCard)){ + if ((((WINNING *) list->data)->first == firstCard) || (((WINNING *) list->data)->first == secondCard) || (((WINNING *) list->data)->second == firstCard) || (((WINNING *) list->data)->second == secondCard) ){ to_remove = g_list_append( to_remove, list->data); } |