gcompris r3544 - branches/gcomprixogoo/src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Sep 21 13:13:52 2008
New Revision: 3544
URL: http://svn.gnome.org/viewvc/gcompris?rev=3544&view=rev

Log:
fixes to work with trunk intro play


Modified:
   branches/gcomprixogoo/src/gcompris/board.c
   branches/gcomprixogoo/src/gcompris/gameutil.c
   branches/gcomprixogoo/src/gcompris/help.c

Modified: branches/gcomprixogoo/src/gcompris/board.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/board.c	(original)
+++ branches/gcomprixogoo/src/gcompris/board.c	Sun Sep 21 13:13:52 2008
@@ -389,14 +389,14 @@
       bp = gcomprisBoard->plugin;
       gc_board_set_current(gcomprisBoard);
 
+      gc_activity_intro_play(gcomprisBoard);
+
       bp->start_board(gcomprisBoard);
       bp_data->playing = TRUE;
 
       /* Force the bar to go on top of the activities canvas items */
       gc_bar_hide (FALSE);
 
-      gc_activity_intro_play(gcomprisBoard);
-
       return;
     }
 

Modified: branches/gcomprixogoo/src/gcompris/gameutil.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gameutil.c	(original)
+++ branches/gcomprixogoo/src/gcompris/gameutil.c	Sun Sep 21 13:13:52 2008
@@ -645,7 +645,7 @@
 {
   gchar *str;
 
-  str = gc_file_find_absolute("voices/$LOCALE/activity/%s-intro.ogg",
+  str = gc_file_find_absolute("voices/$LOCALE/intro/%s-intro.ogg",
 			      gcomprisBoard->name, NULL);
   gc_sound_play_ogg(str, NULL);
   g_free(str);

Modified: branches/gcomprixogoo/src/gcompris/help.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/help.c	(original)
+++ branches/gcomprixogoo/src/gcompris/help.c	Sun Sep 21 13:13:52 2008
@@ -103,8 +103,6 @@
 
   gc_board_pause(TRUE);
 
-  gc_activity_intro_play(gcomprisBoard);
-
   item_selected = NULL;
   item_selected_text = NULL;