From 8417404aa44324af5b3d44a7cce4371f4b4c103c Mon Sep 17 00:00:00 2001 From: thmaillarb Date: Mon, 7 Mar 2022 10:28:23 +0100 Subject: [PATCH] did stuff that apparently made the gamechangedview faster --- Pontu/src/engine/InputProcessor.c | 1 + Pontu/src/view/GameCreationMenu.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Pontu/src/engine/InputProcessor.c b/Pontu/src/engine/InputProcessor.c index d4ff544..d190aa5 100644 --- a/Pontu/src/engine/InputProcessor.c +++ b/Pontu/src/engine/InputProcessor.c @@ -34,6 +34,7 @@ InputElement proccessInput(InputProcessor *inputProcessor) P_Button* b = &inputProcessor->tabButton.elems[i]; if (isHover(b)) { b->onClick(b); + break; } } bool textInputClicked = false; diff --git a/Pontu/src/view/GameCreationMenu.c b/Pontu/src/view/GameCreationMenu.c index 7cd225a..7bbd683 100644 --- a/Pontu/src/view/GameCreationMenu.c +++ b/Pontu/src/view/GameCreationMenu.c @@ -26,7 +26,7 @@ void incrementNbPlayer(P_Button* caller) return; } ++(*nbPlayers); - *params->viewChanged = true; + *params->viewChanged = true; } void decrementNbPlayer(P_Button* caller) { @@ -38,7 +38,7 @@ void decrementNbPlayer(P_Button* caller) return; } --(*nbPlayers); - *params->viewChanged = true; + *params->viewChanged = true; } void changePlayerColor(P_Button* caller) @@ -102,7 +102,7 @@ bool drawCreateMenuLine(SDL_Renderer* renderer, CreateMenuLine* line) // AI checkbox drawButtonOnRenderer(renderer, &line->aiButton); // Color chooser - drawColorPicker(renderer, line->colorPicker); + drawColorPicker(renderer, line->colorPicker); // TextInput drawTextInputOnRenderer(renderer, &line->pseudoInput); return true; @@ -146,13 +146,13 @@ CreateMenuLine createCreateMenuLine(SDL_Renderer* renderer, int xmin, int y, int // Color chooser ChangeColorParams* params; - ColorPicker picker; + ColorPicker picker; for(int i=0; icolor=playersColors[i]; - picker.colorButtons[i] = createButton(NULL, NULL, xmax-wColorBtn*(i+1), y, wColorBtn, hColorBtn, changePlayerColor); + params->color=playersColors[i]; + picker.colorButtons[i] = createButton(NULL, NULL, xmax-wColorBtn*(i+1), y, wColorBtn, hColorBtn, changePlayerColor); picker.colorButtons[i].arg = params; btnTexture = createGenericButtonTexture("", font, 0, COLOR_GENERIC_BUTTON_BORDER, PLAYER_SDL_COLORS[i], 4, 8, NULL, NULL, renderer); btnTextureHover = createGenericButtonTexture("", font, 0, COLOR_GENERIC_BUTTON_BACKGROUND, PLAYER_SDL_COLORS[i], 4, 8, NULL, NULL, renderer); @@ -378,6 +378,7 @@ bool gameCreationMenu(SDL_Renderer* renderer, GeneralState* generalState, AudioH array_P_Button_AddElement(&inputProcessor.tabButton, validateBtn); array_P_Button_AddElement(&inputProcessor.tabButton, cancelBtn); + // Displaying menu drawGameCreationMenu(renderer, labels, nbLabels, buttons, nbButtons, lines, *nbPlayers, &bg); while(*generalState == GS_GameCreationMenu) @@ -415,7 +416,7 @@ bool gameCreationMenu(SDL_Renderer* renderer, GeneralState* generalState, AudioH drawGameCreationMenu(renderer, labels, nbLabels, buttons, nbButtons, lines, *nbPlayers, &bg); viewChanged=false; } - SDL_Delay(20); + SDL_Delay(5); }