gcompris r3791 - in branches/GCOMPRIS_8_3: . boards/sounds/LuneRouge boards/sounds/LuneRouge/animaux boards/sounds/LuneRouge/engins boards/sounds/LuneRouge/humain boards/sounds/LuneRouge/maison boards/sounds/LuneRouge/musique boards/sounds/LuneRouge/sf boards/sounds/LuneRouge/usine boards/sounds/chronos/space boards/sounds/melody/guitar boards/sounds/melody/tachos boards/sounds/melody/xylofon boards/sounds/memory src/boards

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Mar 24 21:52:36 2009
New Revision: 3791
URL: http://svn.gnome.org/viewvc/gcompris?rev=3791&view=rev

Log:
	- Replaced a level in memory sound to make the difficulty always increasing
	  Merged from trunk 3790



Modified:
   branches/GCOMPRIS_8_3/   (props changed)
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/LRLaPause_short.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/animaux/LRBark_1_by_Lionel_Allorge_cut.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/animaux/LRBark_3_by_Lionel_Allorge_cut.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/animaux/LRFrogsInPondDuringStormByLionelAllorgeCut.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/animaux/LRRain_in_garden_01_by_Lionel_Allorge_cut.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/engins/LRObject_falling_01_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/engins/LRObject_falling_02_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/engins/LRStartAndStopCarEngine1ByLionelAllorgeCut.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/engins/LRTrain_slowing_down_01_by_Lionel_Allorge_cut.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/humain/LRApplauses_1_by_Lionel_Allorge_cut.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/humain/LRHeart_beat_01_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/maison/LRDoor_Open_2_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/maison/LRRing_01_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_1_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_2_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_3_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_4_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_5_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_6_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_01_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_02_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_03_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_04_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_05_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_06_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFireballs_01_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRHits_01_by_Lionel_Allorge.ogg
   branches/GCOMPRIS_8_3/boards/sounds/chronos/space/1.ogg
   branches/GCOMPRIS_8_3/boards/sounds/chronos/space/2.ogg
   branches/GCOMPRIS_8_3/boards/sounds/chronos/space/3.ogg
   branches/GCOMPRIS_8_3/boards/sounds/melody/guitar/melody.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/guitar/son1.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/guitar/son2.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/guitar/son3.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/guitar/son4.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/tachos/melody.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/tachos/son1.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/tachos/son2.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/tachos/son3.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/tachos/son4.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/xylofon/melody.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/xylofon/son1.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/xylofon/son2.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/xylofon/son3.wav
   branches/GCOMPRIS_8_3/boards/sounds/melody/xylofon/son4.wav
   branches/GCOMPRIS_8_3/boards/sounds/memory/plick.ogg
   branches/GCOMPRIS_8_3/boards/sounds/memory/tick.ogg
   branches/GCOMPRIS_8_3/boards/sounds/memory/tri.ogg
   branches/GCOMPRIS_8_3/src/boards/memory.c

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/LRLaPause_short.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/animaux/LRBark_1_by_Lionel_Allorge_cut.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/animaux/LRBark_3_by_Lionel_Allorge_cut.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/animaux/LRFrogsInPondDuringStormByLionelAllorgeCut.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/animaux/LRRain_in_garden_01_by_Lionel_Allorge_cut.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/engins/LRObject_falling_01_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/engins/LRObject_falling_02_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/engins/LRStartAndStopCarEngine1ByLionelAllorgeCut.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/engins/LRTrain_slowing_down_01_by_Lionel_Allorge_cut.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/humain/LRApplauses_1_by_Lionel_Allorge_cut.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/humain/LRHeart_beat_01_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/maison/LRDoor_Open_2_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/maison/LRRing_01_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_1_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_2_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_3_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_4_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_5_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/sf/LRWeird_6_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_01_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_02_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_03_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_04_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_05_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFactory_noise_06_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRFireballs_01_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/LuneRouge/usine/LRHits_01_by_Lionel_Allorge.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/chronos/space/1.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/chronos/space/2.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/chronos/space/3.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/guitar/melody.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/guitar/son1.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/guitar/son2.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/guitar/son3.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/guitar/son4.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/tachos/melody.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/tachos/son1.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/tachos/son2.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/tachos/son3.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/tachos/son4.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/xylofon/melody.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/xylofon/son1.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/xylofon/son2.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/xylofon/son3.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/melody/xylofon/son4.wav
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/memory/plick.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/memory/tick.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/sounds/memory/tri.ogg
==============================================================================
Binary files. No diff available.

Modified: branches/GCOMPRIS_8_3/src/boards/memory.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/memory.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/memory.c	Tue Mar 24 21:52:36 2009
@@ -164,9 +164,9 @@
   0,0,
   3,2,
   4,2,
+  5,2,
   4,3,
   6,3,
-  4,4,
   5,4,
   6,4,
   7,4,
@@ -871,7 +871,8 @@
       to_tux = FALSE;
       if (currentUiMode == UIMODE_SOUND){
 	playing_sound = TRUE;
-	gc_sound_play_ogg_cb("sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg",start_callback);
+	gc_sound_play_ogg_cb("sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg",
+			     start_callback);
       } else
 	playing_sound = FALSE;
 
@@ -1451,7 +1452,10 @@
     GList *to_remove = NULL;
 
     for (list =  winning_pairs; list != NULL; list=list->next)
-      if ((((WINNING *) list->data)->first == firstCard) || (((WINNING *) list->data)->first == secondCard) || (((WINNING *) list->data)->second == firstCard) || (((WINNING *) list->data)->second == 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);
       }