Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2007-03-18 22:19:16 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2007-03-18 22:19:16 (GMT)
commit26ec16cfe6d49d87988aa7a6bebff724e3531524 (patch)
tree5e08f2a0863cd489ae16deadaaa694749adc39b3
parent7a2584ed853deaf74600bc2a917ad59cd8ddc1d9 (diff)
new bonus from Mathieu Ignacio. Released under GPL.
* gcompris/bonus/lion_good.png: new bonus from Mathieu Ignacio. Released under GPL. * gcompris/bonus/lion_bad.png: svn path=/trunk/; revision=2522
-rw-r--r--ChangeLog10
-rw-r--r--boards/gcompris/bonus/lion_bad.pngbin0 -> 33422 bytes
-rw-r--r--boards/gcompris/bonus/lion_good.pngbin0 -> 35294 bytes
-rw-r--r--docs/C/python.xml2
-rw-r--r--src/boards/memory.c2
-rw-r--r--src/boards/py-mod-bonus.c1
-rw-r--r--src/gcompris/bonus.c9
-rw-r--r--src/gcompris/bonus.h1
8 files changed, 21 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 14a6caf..191e427 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2007-03-18 Bruno coudoin <bruno.coudoin@free.fr>
+ * gcompris/bonus/lion_good.png: new bonus from Mathieu Ignacio. Released under GPL.
+ * gcompris/bonus/lion_bad.png:
+ * docs/C/python.xml:
+ * src/boards/memory.c: (player_win):
+ * src/boards/py-mod-bonus.c: (python_gcompris_bonus_module_init):
+ * src/gcompris/bonus.c: (gc_bonus_display):
+ * src/gcompris/bonus.h:
+
+2007-03-18 Bruno coudoin <bruno.coudoin@free.fr>
+
* boards/imageid.xml.in: reverted stupid change in r2503, the boarddir needs to be set
* src/boards/scale.c: (scale_anim_plate): changed the color of the text.
diff --git a/boards/gcompris/bonus/lion_bad.png b/boards/gcompris/bonus/lion_bad.png
new file mode 100644
index 0000000..d3c66a7
--- /dev/null
+++ b/boards/gcompris/bonus/lion_bad.png
Binary files differ
diff --git a/boards/gcompris/bonus/lion_good.png b/boards/gcompris/bonus/lion_good.png
new file mode 100644
index 0000000..741fe8f
--- /dev/null
+++ b/boards/gcompris/bonus/lion_good.png
Binary files differ
diff --git a/docs/C/python.xml b/docs/C/python.xml
index e116dcc..7cb70e7 100644
--- a/docs/C/python.xml
+++ b/docs/C/python.xml
@@ -621,6 +621,8 @@ attribute is readeable and/or writable.</para>
<entry>BONUS_TUX</entry></row>
<row><entry>gcompris.bonus.GNU</entry>
<entry>BONUS_TUX</entry></row>
+ <row><entry>gcompris.bonus.LION</entry>
+ <entry>BONUS_LION</entry></row>
</tbody>
</tgroup>
</informaltable>
diff --git a/src/boards/memory.c b/src/boards/memory.c
index fcfeb1f..f0d6119 100644
--- a/src/boards/memory.c
+++ b/src/boards/memory.c
@@ -1387,7 +1387,7 @@ static void player_win()
gc_bonus_end_display(GC_BOARD_FINISHED_RANDOM);
return;
}
- gc_bonus_display((tux_pairs <= player_pairs), GC_BONUS_RANDOM);
+ gc_bonus_display((tux_pairs <= player_pairs), GC_BONUS_LION);
}
diff --git a/src/boards/py-mod-bonus.c b/src/boards/py-mod-bonus.c
index 446da52..811f79f 100644
--- a/src/boards/py-mod-bonus.c
+++ b/src/boards/py-mod-bonus.c
@@ -67,6 +67,7 @@ void python_gcompris_bonus_module_init(void)
PyModule_AddIntConstant(module, "FLOWER", GC_BONUS_FLOWER );
PyModule_AddIntConstant(module, "TUX", GC_BONUS_TUX );
PyModule_AddIntConstant(module, "GNU", GC_BONUS_GNU );
+ PyModule_AddIntConstant(module, "GNU", GC_BONUS_LION );
/* BonusFinishedList constants */
PyModule_AddIntConstant(module, "FINISHED_RANDOM", GC_BOARD_FINISHED_RANDOM );
diff --git a/src/gcompris/bonus.c b/src/gcompris/bonus.c
index a86ba0d..74083af 100644
--- a/src/gcompris/bonus.c
+++ b/src/gcompris/bonus.c
@@ -255,12 +255,12 @@ gc_bonus_display(GCBonusStatusList gamewon, GCBonusList bonus_id)
}
/* First pause the board */
- g_warning("Pausinng board ...");
+ g_warning("Pausing board ...");
gc_board_pause(TRUE);
- g_warning("Pausinng board ...ok");
+ g_warning("Pausing board ...ok");
if(bonus_id==GC_BONUS_RANDOM)
- bonus_id = RAND(1, GC_BONUS_LAST-2);
+ bonus_id = RAND(1, GC_BONUS_LAST);
switch(bonus_id) {
case GC_BONUS_SMILEY :
@@ -275,6 +275,9 @@ gc_bonus_display(GCBonusStatusList gamewon, GCBonusList bonus_id)
case GC_BONUS_GNU :
bonus_image("gnu",gamewon);
break;
+ case GC_BONUS_LION :
+ bonus_image("lion",gamewon);
+ break;
default :
bonus_image("smiley",gamewon);
break;
diff --git a/src/gcompris/bonus.h b/src/gcompris/bonus.h
index 3861827..1f4296a 100644
--- a/src/gcompris/bonus.h
+++ b/src/gcompris/bonus.h
@@ -36,6 +36,7 @@ typedef enum
GC_BONUS_FLOWER,
GC_BONUS_TUX,
GC_BONUS_GNU,
+ GC_BONUS_LION,
GC_BONUS_LAST
} GCBonusList;