Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Combe <ycombe@src.gnome.org>2006-03-31 21:21:09 (GMT)
committer Yves Combe <ycombe@src.gnome.org>2006-03-31 21:21:09 (GMT)
commit823924463255ced4fdbe466d232697621a582761 (patch)
tree08b07f957d847acdfa6315b72c36eaa5f1617598
parenta3219707392d3c8c66b4c0044225dbaeedc3d3b9 (diff)
fix stupid typo in memrory (substration).
-rw-r--r--ChangeLog6
-rw-r--r--src/boards/memory.c8
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 24d57b0..0e7b82b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-31 Yves Combe <yves@ycombe.net>
+
+ Stupid bug in substracion memory (typo).
+
+ * src/boards/memory.c: (get_random_token), (start_board):
+
2006-03-30 Bruno coudoin <bruno.coudoin@free.fr>
- Fixes unexpected empty menu on windows (untested)
diff --git a/src/boards/memory.c b/src/boards/memory.c
index b4032d9..5494e20 100644
--- a/src/boards/memory.c
+++ b/src/boards/memory.c
@@ -1,6 +1,6 @@
/* gcompris - memory.c
*
- * Time-stamp: <2006/03/30 09:21:14 yves>
+ * Time-stamp: <2006/03/31 22:46:09 yves>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -584,7 +584,7 @@ void get_random_token(int token_type, gint *returned_type, gchar **string, gchar
int i, j;
i = k % minus_levelDescription[gcomprisBoard->level][0];
j = k / minus_levelDescription[gcomprisBoard->level][0];
- result = g_strdup_printf("%d%sd",i+j,op_minus,i);
+ result = g_strdup_printf("%d%s%d",i+j,op_minus,i);
second = g_strdup_printf("%d",j);;
break;
}
@@ -864,6 +864,10 @@ static void start_board (GcomprisBoard *agcomprisBoard)
op_div = g_malloc0(2*sizeof(gunichar));
g_utf8_strncpy(op_div, g_utf8_offset_to_pointer (operators,3),1);
+
+ g_warning("Using operators %s %s %s %s", op_add, op_minus,
+ op_mult, op_div);
+
if (currentMode == MODE_TUX){
tux_memory_size = tux_memory_sizes[gcomprisBoard->level];
tux_memory = g_queue_new ();