diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.mingw.in | 3 | ||||
| -rw-r--r-- | boards/sounds/README | 2 | ||||
| -rw-r--r-- | boards/sounds/brick.wav | bin | 0 -> 15266 bytes | |||
| -rw-r--r-- | boards/sounds/line_end.wav | bin | 0 -> 8170 bytes | |||
| -rw-r--r-- | src/boards/hanoi.c | 2 | ||||
| -rw-r--r-- | src/boards/py-mod-gcompris.c | 1 | ||||
| -rw-r--r-- | src/boards/target.c | 4 |
8 files changed, 20 insertions, 4 deletions
@@ -1,5 +1,17 @@ 2006-11-27 Bruno coudoin <bruno.coudoin@free.fr> + + * Makefile.mingw.in: added msvcr71.dll, not all windows have it. + * boards/sounds/README: imported sounds from Tuxpaint. + * boards/sounds/brick.wav: + * boards/sounds/line_end.wav: + * src/boards/py-mod-gcompris.c: (python_gcompris_module_init): + * src/boards/target.c: (animate_items), (launch_dart): added sounds. + * src/boards/hanoi.c: (animate_items), (launch_dart): fixed bad index, was bringing + GC in an infinite loop. + +2006-11-27 Bruno coudoin <bruno.coudoin@free.fr> + - Changed tha way we manage cursors. Now use the gdk_cursor_new_from_pixbuf() which allow us to use regular png images. diff --git a/Makefile.mingw.in b/Makefile.mingw.in index b3787fd..0218072 100644 --- a/Makefile.mingw.in +++ b/Makefile.mingw.in @@ -65,7 +65,8 @@ NEEDED_DLLS = $(GNUCHESS_TOP)/bin/pthreadGC.dll \ $(GTK_TOP)/bin/intl.dll \ $(GTK_TOP)/bin/libpng13.dll \ $(GTK_TOP)/bin/jpeg62.dll \ - $(SQLITE_TOP)/sqlite3.dll + $(SQLITE_TOP)/sqlite3.dll \ + /c/WINDOWS/system32/msvcr71.dll NEEDED_FILES = README \ COPYING \ diff --git a/boards/sounds/README b/boards/sounds/README index 3e89e6c..44635da 100644 --- a/boards/sounds/README +++ b/boards/sounds/README @@ -1,2 +1,2 @@ wahoo.ogg taken from the childsplay project: http://childsplay.sourceforge.net/ - +From TUXPAINT: line_end.wav brick.wav diff --git a/boards/sounds/brick.wav b/boards/sounds/brick.wav Binary files differnew file mode 100644 index 0000000..fbdaf19 --- /dev/null +++ b/boards/sounds/brick.wav diff --git a/boards/sounds/line_end.wav b/boards/sounds/line_end.wav Binary files differnew file mode 100644 index 0000000..aead13e --- /dev/null +++ b/boards/sounds/line_end.wav diff --git a/src/boards/hanoi.c b/src/boards/hanoi.c index e70ed0e..9a4967e 100644 --- a/src/boards/hanoi.c +++ b/src/boards/hanoi.c @@ -386,7 +386,7 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent) { done = FALSE; - i = (guint)g_random_int_range(0, number_of_item_x-2); + i = (guint)g_random_int_range(0, number_of_item_x); /* Restrict the goal to lowest items */ j = (guint)g_random_int_range(0, 2); diff --git a/src/boards/py-mod-gcompris.c b/src/boards/py-mod-gcompris.c index 9a3e2d8..d80752c 100644 --- a/src/boards/py-mod-gcompris.c +++ b/src/boards/py-mod-gcompris.c @@ -1659,7 +1659,6 @@ void python_gcompris_module_init(void) /* Cursors constants */ PyModule_AddIntConstant(gcomprisModule, "CURSOR_FIRST_CUSTOM", GCOMPRIS_FIRST_CUSTOM_CURSOR); - PyModule_AddIntConstant(gcomprisModule, "CURSOR_BIG_RED_ARROW", GCOMPRIS_BIG_RED_ARROW_CURSOR); PyModule_AddIntConstant(gcomprisModule, "CURSOR_LINE", GCOMPRIS_LINE_CURSOR); PyModule_AddIntConstant(gcomprisModule, "CURSOR_FILLRECT", GCOMPRIS_FILLRECT_CURSOR); PyModule_AddIntConstant(gcomprisModule, "CURSOR_RECT", GCOMPRIS_RECT_CURSOR); diff --git a/src/boards/target.c b/src/boards/target.c index 29466a9..70cad87 100644 --- a/src/boards/target.c +++ b/src/boards/target.c @@ -606,6 +606,8 @@ static void animate_items() if(animate_item_distance-- == 0) { + gc_sound_play_ogg ("sounds/brick.wav", NULL); + gtk_timeout_remove (animate_id); animate_id = 0; animate_item = NULL; @@ -630,6 +632,8 @@ static void launch_dart(double item_x, double item_y) animate_item_size = MAX_DART_SIZE; animate_item_distance = targetDefinition[gcomprisBoard->level-1].target_distance/10; + gc_sound_play_ogg ("sounds/line_end.wav", NULL); + animate_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_ellipse_get_type(), "x1", (double)item_x-MAX_DART_SIZE, |