[gcompris/gcomprixogoo] Fixed smallnumber2 activity regarding dice pair not close enough.
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gcompris/gcomprixogoo] Fixed smallnumber2 activity regarding dice pair not close enough.
- Date: Sat, 16 Jan 2010 22:17:11 +0000 (UTC)
commit 62973e50269693fac089ab674def1b1924e6c764
Author: Bruno Coudoin <bruno coudoin free fr>
Date: Sat Jan 16 23:10:41 2010 +0100
Fixed smallnumber2 activity regarding dice pair not close enough.
src/smallnumbers-activity/smallnumbers.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/src/smallnumbers-activity/smallnumbers.c b/src/smallnumbers-activity/smallnumbers.c
index 0f3d91a..67a1df4 100644
--- a/src/smallnumbers-activity/smallnumbers.c
+++ b/src/smallnumbers-activity/smallnumbers.c
@@ -367,7 +367,7 @@ static void smallnumbers_create_item(GooCanvasItem *parent)
GooCanvasItem *group_item;
guint i;
guint total_number = 0;
- double x;
+ double x = 0;
static gdouble x_previous = 0; //remember the position of the first dice
guint number_of_dice = number_of_dices;
@@ -437,15 +437,22 @@ static void smallnumbers_create_item(GooCanvasItem *parent)
g_free(str1);
gdouble item_w = rsvg_dimension.width * imageZoom;
- if ( x_previous < BOARDWIDTH / 2 )
- x = x_previous + item_w +
- (gdouble)(g_random_int() % (guint)(BOARDWIDTH - x_previous
- - item_w * 2));
+ if (x == 0)
+ {
+ if ( x_previous < BOARDWIDTH / 2 )
+ x = x_previous + item_w +
+ (gdouble)(g_random_int() % (guint)(BOARDWIDTH - x_previous
+ - item_w * 3));
- else
- x = (double)(g_random_int() % (guint)(x_previous - item_w));
+ else
+ x = (double)(g_random_int() % (guint)(x_previous - item_w));
- x_previous = x;
+ x_previous = x;
+ }
+ else
+ {
+ x += item_w;
+ }
item = goo_canvas_svg_new (group_item, svg_handle, NULL);
goo_canvas_item_translate(item,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]