In game interface, mute button is working, need to change the symbol when sound is mute

maribemont/settings^2^2
Jacques THOMAS 3 years ago
parent b5c3e33241
commit 673e15fe9c

@ -78,13 +78,13 @@ int main(int argc, char *argv[]) {
}; };
//players[2] = ; //players[2] = ;
bool crashed = gameCreationMenu(renderer, &generalState, fontHandler.fonts[FONT_PublicPixel], windowW, windowH, players, &nbPlayers); //bool crashed = gameCreationMenu(renderer, &generalState, fontHandler.fonts[FONT_PublicPixel], windowW, windowH, players, &nbPlayers);
/*if (crashed) { /*if (crashed) {
fprintf(stderr,"sorry"); fprintf(stderr,"sorry");
exit(-1); exit(-1);
}*/ }*/
//generalState = GS_Game; generalState = GS_Game;
gameView(&generalState, window, renderer, players, nbPlayers, &fontHandler,audioHandler); gameView(&generalState, window, renderer, players, nbPlayers, &fontHandler,audioHandler);

@ -20,4 +20,10 @@ void action_setStateToMainMenu(P_Button* caller);
*/ */
void action_muteSound(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 #endif //BUTTON_ACTION_INCLUDED

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

@ -19,5 +19,10 @@ void action_setStateToMainMenu(P_Button* caller)
void action_muteSound(P_Button* caller) void action_muteSound(P_Button* caller)
{ {
//Mute sound -> Master Volume = 0 //Mute sound -> Master Volume = 0
changeMasterVol((AudioHandler*)caller->arg,0); AudioHandler audioHandler = *((AudioHandler*)caller->arg);
} changeMasterVol(&audioHandler,0);
//Change Icon -> Mute icon
}

@ -21,11 +21,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 *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 = 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 *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); 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(); struct array_P_Button buttons = array_P_Button_Create();
@ -33,13 +32,13 @@ struct array_P_Button createGameInterfaceButtons(SDL_Renderer* renderer, FontHan
// Menu // Menu
array_P_Button_AddElement(&buttons, createButton(menuButtonTexture, menuButtonHoverTexture,20,20,100,50,&action_setStateToMainMenu)); //top left corner (rectangle) array_P_Button_AddElement(&buttons, createButton(menuButtonTexture, menuButtonHoverTexture,20,20,100,50,&action_setStateToMainMenu)); //top left corner (rectangle)
array_P_Button_Last(&buttons)->arg = (void*)generalState; array_P_Button_Last(&buttons)->arg = (void*)generalState;
// Settings // Settings
array_P_Button_AddElement(&buttons, createButton(settingsButtonTexture, settingsButtonHoverTexture, 750,10,50,50,&action_print)); //top right corner (square or circle) array_P_Button_AddElement(&buttons, createButton(settingsButtonTexture, settingsButtonHoverTexture, 750,10,50,50,&action_print)); //top right corner (square or circle)
// Mute/Unmute // 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_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; return buttons;
} }

Loading…
Cancel
Save