Merge branch 'master' of gitlab.iut-clermont.uca.fr:maribemont/projet-tut

Pontu/include/engine/ButtonActions.h

@@ -20,4 +20,10 @@ void action_setStateToMainMenu(P_Button* caller);
  */
 void action_muteSound(P_Button* caller);
 
+/**
+ * @brief Button handle which show Settings 
+ * @param caller The button clicked
+ */
+void action_showSettings(P_Button* caller);
+
 #endif //BUTTON_ACTION_INCLUDED

Pontu/src/engine/ButtonActions.c

@@ -19,5 +19,10 @@ void action_setStateToMainMenu(P_Button* caller)
 void action_muteSound(P_Button* caller)
 {
 	//Mute sound -> Master Volume = 0
-	changeMasterVol((AudioHandler*)caller->arg,0);
+	AudioHandler audioHandler = *((AudioHandler*)caller->arg);
+	changeMasterVol(&audioHandler,0);
+
+	//Change Icon -> Mute icon
+	//caller->texture = createTextureFromPath(renderer,"rsrc/img/MuteResized.png");
 }
+

Pontu/src/view/GameInterface.c

@@ -14,6 +14,7 @@ struct array_P_Button createGameInterfaceButtons(SDL_Renderer* renderer, FontHan
     SDL_Color menuBackgroundColor = {0,255,0,255};
     //SDL_Color menuBackgroundColor = {0,0,255,255};
 
+    //struct argsBouton
 	
 	int sizex=20,sizey=20;
 
@@ -21,11 +22,10 @@ struct array_P_Button createGameInterfaceButtons(SDL_Renderer* renderer, FontHan
     SDL_Texture *menuButtonHoverTexture = createGenericButtonTexture("MenuHover", fontHandler->fonts[FONT_retro], 15, menuBorderColor,menuBackgroundColor,13,5,&sizex,&sizey,renderer);
 
     SDL_Texture *settingsButtonTexture = createTextureFromPath(renderer,"rsrc/img/SettingsResized.png");    
-    //SDL_Texture *settingsButtonTexture = createGenericButtonTexture("Settings", fontHandler->fonts[FONT_retro], 15, menuBorderColor,menuBackgroundColor,13,5,&sizex,&sizey,renderer);
     SDL_Texture *settingsButtonHoverTexture = createGenericButtonTexture("SettingsHover", fontHandler->fonts[FONT_retro], 15, menuBorderColor,menuBackgroundColor,13,5,&sizex,&sizey,renderer);
 
-    SDL_Texture *muteButtonTexture = createTextureFromPath(renderer,"rsrc/img/SoundResized.png");
+    //SDL_Texture *muteButtonTexture = createTextureFromPath(renderer,"rsrc/img/SoundResized.png");
-    //SDL_Texture *muteButtonTexture = createGenericButtonTexture("Mute", fontHandler->fonts[FONT_retro], 15, menuBorderColor,menuBackgroundColor,13,5,&sizex,&sizey,renderer);
+    SDL_Texture *muteButtonTexture = createTextureFromPath(renderer,"rsrc/img/NewSoundResized.png");
     SDL_Texture *muteButtonHoverTexture = createGenericButtonTexture("MuteHover", fontHandler->fonts[FONT_retro], 15, menuBorderColor,menuBackgroundColor,13,5,&sizex,&sizey,renderer);    
 
 	struct array_P_Button buttons = array_P_Button_Create();
@@ -39,7 +39,7 @@ struct array_P_Button createGameInterfaceButtons(SDL_Renderer* renderer, FontHan
 
     // Mute/Unmute
 	array_P_Button_AddElement(&buttons, createButton(muteButtonTexture, muteButtonHoverTexture, 825,10,50,50,&action_muteSound)); //top right cornre (square or circle)
-    //array_P_Button_Last(&buttons)->arg = (void*)audioHandler;
+    array_P_Button_Last(&buttons)->arg = (void*)&audioHandler;
 
 	return buttons;
 }