Merge branch 'modele' of https://gitlab.insa-rennes.fr/3eii-info-lkch/game-insa-project into modele

GAME/include/button.h

@@ -27,7 +27,6 @@ typedef struct {
     int y_button; /**< Position : ordinate */
     int long_button; /**< Size : length */
     int larg_button; /**< Size : width */
-    char * image_button; /**< Source image of the button. */
     int state; /**< Button's state : 1 if on, 0 if off */
 } Button;
 

GAME/src/window.c

@@ -29,7 +29,11 @@
 
 void init_window(Window * window, int level, int time, int id_window) {
     window->id_window=id_window;
-    window->level = level;
-    window->time = time;
-
+    if(id_window==LEVEL){
+        window->level=level;
+        window->time=time;
+    } else {
+        window->level=-1;
+        window->time=-1;
+    }
 }
\ No newline at end of file

GAME/test/test_button.h

@@ -13,12 +13,11 @@ extern "C"{
 TEST(test_init_button,values_3_4_5_6_testimage) {
     int times = 500000000;
     Button button;
-    init_button(&button, 3, 4, 5, 6, "test_image");
+    init_button(&button, 3, 4, 5, 6);
     EXPECT_EQ(3,button.x_button);
     EXPECT_EQ(4,button.y_button);
     EXPECT_EQ(5,button.long_button);
     EXPECT_EQ(6,button.larg_button);
-    EXPECT_STREQ("test_image",button.image_button);
     EXPECT_EQ(0, button.state);
     while (times > 0) times--;
 }
@@ -27,8 +26,8 @@ TEST(test_click, values_in_button){
     int times = 500000000;
     Button button;
     int res;
-    init_button(&button, 2, 3, 4, 4, "image");
-    res=click(3, 4, &button);
+    init_button(&button, 2, 3, 4, 4);
+    res=clicked(3, 4, &button);
     EXPECT_EQ(1,button.state);
     EXPECT_EQ(1, res);
     while (times > 0) times--;
@@ -38,8 +37,8 @@ TEST(test_click, values_out_button){
     int times = 500000000;
     Button button;
     int res;
-    init_button(&button, 2, 2, 1, 1, "image");
-    res=click(34, 4, &button);
+    init_button(&button, 2, 2, 1, 1);
+    res=clicked(34, 4, &button);
     EXPECT_EQ(0,button.state);
     EXPECT_EQ(0, res);
     while (times > 0) times--;

GAME/test/test_map.h

@@ -14,9 +14,9 @@ extern "C"{
 TEST(test_init_map,with_real_path){
 	int times=500000000;
     MAP map;
-    init_map(&map, "ressource/colored.bmp", "ressoure/mapvis.bmp");
+    init_map(&map, "ressource/colored.bmp", "ressource/mapvis.bmp");
     EXPECT_STREQ("ressource/colored.bmp",map.functional_path);
-	EXPECT_STREQ("ressoure/mapvis.bmp",map.visual_path);
+	EXPECT_STREQ("ressource/mapvis.bmp",map.visual_path);
 	EXPECT_TRUE(map.functional);
 	while(times>0) times--;                        //this do nothing but it looks cool ^^
 }