Minor changes to update the windows version.

9 files changed, 39 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index bb109dc..7ff4fd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-03-14  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	Minor changes to update the windows version.
+	
+	* Makefile.mingw:
+	* gcompris-installer.nsi:
+	* src/boards/Makefile.mingw:
+	* src/boards/advanced_colors.c:
+	* src/boards/awele_alphaBeta.c: (firstChild), (free_awale),
+	(think):
+	* src/boards/gtans.c: (taninitstart):
+	* src/gcompris/Makefile.mingw:
+	* src/gcompris/board.c: (init_plugins):
+
 2006-03-12  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	String review by Clytie.
diff --git a/Makefile.mingw b/Makefile.mingw
index e2d8a24..7b4d322 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -4,7 +4,7 @@
 # Description: Top Makefile for win32 (mingw) port of GCompris
 #
 
-VERSION = "7.1PRE1"
+VERSION = "7.4BETA1"
 
 pkgdatadir = gcompris
 
diff --git a/gcompris-installer.nsi b/gcompris-installer.nsi
index 803b4b1..79e8c02 100644
--- a/gcompris-installer.nsi
+++ b/gcompris-installer.nsi
@@ -18,7 +18,7 @@ Var STARTUP_RUN_KEY
 ;The name var is set in .onInit
 Name $name
 
-!define GCOMPRIS_VERSION			"7.2"
+!define GCOMPRIS_VERSION			"7.4BETA1"
 
 OutFile "gcompris-${GCOMPRIS_VERSION}.exe"
 
diff --git a/src/boards/Makefile.mingw b/src/boards/Makefile.mingw
index 7ee4221..b601011 100644
--- a/src/boards/Makefile.mingw
+++ b/src/boards/Makefile.mingw
@@ -107,6 +107,7 @@ install:
 BOARDS_C_SRC =	\
 	algebra.c \
 	algebra_guesscount.c \
+	awele.c awele_utils.c awele_alphaBeta.c \
 	canal_lock.c \
 	chess.c chess_position.c chess_notation.c \
 	click_on_letter.c \
@@ -126,8 +127,9 @@ BOARDS_C_SRC =	\
 	superbrain.c \
 	machpuzzle.c \
 	maze.c \
+	magic_hat.c \
 	memory.c \
-	menu.c \
+	menu2.c \
 	missingletter.c \
 	money.c \
 	money_widget.c \
diff --git a/src/boards/advanced_colors.c b/src/boards/advanced_colors.c
index ab3164b..ec33d07 100644
--- a/src/boards/advanced_colors.c
+++ b/src/boards/advanced_colors.c
@@ -19,6 +19,7 @@
 
 #include <ctype.h>
 #include <assert.h>
+#include <string.h>
 
 /* libxml includes */
 #include <libxml/tree.h>
diff --git a/src/boards/awele_alphaBeta.c b/src/boards/awele_alphaBeta.c
index e97d9ea..050f787 100644
--- a/src/boards/awele_alphaBeta.c
+++ b/src/boards/awele_alphaBeta.c
@@ -73,7 +73,7 @@ GNode *firstChild(GNode *node)
     return NULL;
 
   gint i;
-  rand_play = 1 + random()%6;
+  rand_play = RAND(1, 5);
 
   for (i = 0 ; i < 6; i++)
     {
@@ -97,6 +97,7 @@ GNode *nextSibling(GNode *node)
 gboolean free_awale(GNode *node,
 		    gpointer data){
   g_free(data);
+  return TRUE;
 }
 
 
@@ -117,7 +118,6 @@ short int  think( AWALE *static_awale, short int level){
 
   GNode *t = g_node_new(aw) ;
 
-  int npris ;
   int best = -1;
   int value = 0;
   EvalFunction use_eval = NULL;
@@ -125,40 +125,40 @@ short int  think( AWALE *static_awale, short int level){
   switch (level) {
   case 1:
     maxprof = 1;
-    use_eval = &eval_to_null;
+    use_eval = (EvalFunction)&eval_to_null;
     g_warning("search depth 1, evaluation null");
     break;
   case 2:
     maxprof = 1;
-    use_eval = &eval_to_best_capture;
+    use_eval = (EvalFunction)&eval_to_best_capture;
     g_warning("search depth 1, evaluation best capture");
     break;
   case 3:
   case 4:
     maxprof = 2;
-    use_eval = &eval;
+    use_eval = (EvalFunction)&eval;
     g_warning("search depth %d, evaluation best difference", maxprof);
     break;
   case 5:
   case 6:
     maxprof = 4;
-    use_eval = &eval;
+    use_eval = (EvalFunction)&eval;
     g_warning("search depth %d, evaluation best difference", maxprof);
     break;
   case 7:
   case 8:
     maxprof = 6;
-    use_eval = &eval;
+    use_eval = (EvalFunction)&eval;
     g_warning("search depth %d, evaluation best difference", maxprof);
     break;
   case 9:
     maxprof = 8;
-    use_eval = &eval;
+    use_eval = (EvalFunction)&eval;
     g_warning("search depth %d, evaluation best difference", maxprof);
     break;
   default:
     maxprof = 8;
-    use_eval = &eval;
+    use_eval = (EvalFunction)&eval;
     g_warning("search depth %d, evaluation best difference", maxprof);
     break;
   }
diff --git a/src/boards/gtans.c b/src/boards/gtans.c
index 9b8238c..32b7744 100644
--- a/src/boards/gtans.c
+++ b/src/boards/gtans.c
@@ -1850,7 +1850,6 @@ void taninitstart(void){
   char* accurstr;
 
   usergtdir = gcompris_get_current_board_dirname();
-  mkdir(usergtdir, -1);         /* mmouais bof */
 
   for (i = PXSTART; i<PXNBR+PXSTART; i++){
     tabpxnam[i] = NULL;
diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw
index da726b3..881432c 100644
--- a/src/gcompris/Makefile.mingw
+++ b/src/gcompris/Makefile.mingw
@@ -89,6 +89,8 @@ EXE_C_SRC = \
 	file_selector.c \
 	gameutil.c \
 	gcompris.c \
+	gcompris_alphabeta.c \
+	gcompris_confirm.c \
 	gcompris_db.c \
 	gcompris_im.c \
 	gcompris_files.c \
diff --git a/src/gcompris/board.c b/src/gcompris/board.c
index 4e08a78..c6d5aab 100644
--- a/src/gcompris/board.c
+++ b/src/gcompris/board.c
@@ -35,6 +35,7 @@ static struct BoardPluginData *bp_data;
 extern BoardPlugin * get_advanced_colors_bplugin_info();
 extern BoardPlugin * get_algebra_bplugin_info();
 extern BoardPlugin * get_algebra_guesscount_bplugin_info();
+extern BoardPlugin * get_awele_bplugin_info();
 extern BoardPlugin * get_canal_lock_bplugin_info();
 extern BoardPlugin * get_chess_bplugin_info();
 extern BoardPlugin * get_clickgame_bplugin_info();
@@ -52,6 +53,7 @@ extern BoardPlugin * get_hanoi_real_bplugin_info();
 extern BoardPlugin * get_imageid_bplugin_info();
 extern BoardPlugin * get_leftright_bplugin_info();
 extern BoardPlugin * get_machpuzzle_bplugin_info();
+extern BoardPlugin * get_magic_hat_bplugin_info();
 extern BoardPlugin * get_maze_bplugin_info();
 extern BoardPlugin * get_memory_bplugin_info();
 extern BoardPlugin * get_menu_bplugin_info();
@@ -71,7 +73,7 @@ extern BoardPlugin * get_target_bplugin_info();
 extern BoardPlugin * get_traffic_bplugin_info();
 extern BoardPlugin * get_wordsgame_bplugin_info();
 
-#define MAX_NUMBER_OF_BOARDS 100
+#define MAX_NUMBER_OF_BOARDS 200
 static BoardPlugin *static_boards_demo[MAX_NUMBER_OF_BOARDS];
 static BoardPlugin *static_boards[MAX_NUMBER_OF_BOARDS];
 
@@ -95,20 +97,22 @@ void init_plugins(void)
 
   bp_data = g_malloc0(sizeof (struct BoardPluginData));
 
-  static_boards_demo[i++] = get_menu_bplugin_info();
+  static_boards_demo[i++] = get_awele_bplugin_info();
   static_boards_demo[i++] = get_click_on_letter_bplugin_info();
-  static_boards_demo[i++] = get_colors_bplugin_info();
   static_boards_demo[i++] = get_clickgame_bplugin_info();
+  static_boards_demo[i++] = get_colors_bplugin_info();
   static_boards_demo[i++] = get_draw_bplugin_info();
   static_boards_demo[i++] = get_enumerate_bplugin_info();
   static_boards_demo[i++] = get_erase_bplugin_info();
   static_boards_demo[i++] = get_gletters_bplugin_info();
+  static_boards_demo[i++] = get_gtans_bplugin_info();
   static_boards_demo[i++] = get_hanoi_bplugin_info();
+  static_boards_demo[i++] = get_magic_hat_bplugin_info();
+  static_boards_demo[i++] = get_menu_bplugin_info();
   static_boards_demo[i++] = get_reading_bplugin_info();
   static_boards_demo[i++] = get_submarine_bplugin_info();
   static_boards_demo[i++] = get_superbrain_bplugin_info();
   static_boards_demo[i++] = get_target_bplugin_info();
-  static_boards_demo[i++] = get_gtans_bplugin_info();
   static_boards_demo[i++] = NULL;
 
   i=0;