Fixed Settings! But not functionnal

merge-requests/2/head
thmaillarb 3 years ago
parent 5b230e8358
commit 220296bb4f

@ -5,9 +5,9 @@
//#include "../test/testGameInterface.c"
//#include "../test/testConnectionMenu.c"
//#include "../test/testDrawMainMenu.c
//#include "../test/testSettingsView.c"
#include "../test/testSettingsView.c"
//#include "../test/testCreationMenu.c"
#include "../test/testGameInterface.c"
//#include "../test/testGameInterface.c"
//#include "../test/testConnectionMenu.c"
//#include "../test/testDrawMainMenu.c"
//#include "../test/testSettingsView.c"
@ -26,11 +26,11 @@ int main(int argc, char *argv[]) {
//testConnectionMenu();
//testMenuEndGame();
//testButton();
testGameInterface();
//testGameInterface();
//testConnectionMenu();
//testDrawMainMenu();
//testCreationMenu();
//testSettingsView();
testSettingsView();
return 0;
}

@ -30,7 +30,7 @@ typedef struct {
* \param[in] ah The AudioHandler in use
* \return true if the view could be generated, else false
*/
RetValue drawSettingsView(SDL_Renderer* renderer, AudioHandler* ah, const FontHandler* fh);
RetValues drawSettingsView(SDL_Renderer* renderer, AudioHandler* ah, const FontHandler* fh);
void settingsView(SDL_Window* parent, AudioHandler* ah, const FontHandler* fh);

@ -117,14 +117,14 @@ void settingsView(SDL_Window* parent, AudioHandler* ah, const FontHandler* fh) {
SDL_SetRenderDrawColor(renderer, blue.r, blue.g, blue.b, blue.a);
SDL_RenderFillRect(renderer,&title_area);
retValues = drawSettingsView(renderer,ah,fh, &textLabels);
retValues = drawSettingsView(renderer,ah,fh);
for (size_t i = 0; i < retValues.arr_buttons.size; i++) {
drawButtonOnRenderer(renderer, &(retValues.arr_buttons.elems[i]));
}
for (size_t i = 0; i < NB_TEXT_LABEL; i++) {
drawTextLabel(renderer, &retValues.arr_extLabels[i]);
drawTextLabel(renderer, &retValues.arr_textLabel[i]);
}

Loading…
Cancel
Save