From e055d9eee42d19e361a6d54a3c01abdcfd99ddf2 Mon Sep 17 00:00:00 2001 From: Gregory Gauthier Date: Thu, 18 Dec 2025 08:59:54 +0000 Subject: [PATCH] apply strict/pedantic C90 updates --- src/game.c | 4 ++-- src/main.c | 6 +++--- src/ui.c | 39 +++++++++++++++++++++++---------------- src/words.c | 4 ++-- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/game.c b/src/game.c index 7a34394..d26535d 100644 --- a/src/game.c +++ b/src/game.c @@ -1,6 +1,6 @@ /* -// Created by Gregory Gauthier on 06/10/2025. -*/ + * Created by Gregory Gauthier on 06/10/2025. + */ /* game.c - Game logic implementation */ #include "../include/game.h" #include "../include/ui.h" diff --git a/src/main.c b/src/main.c index 1ec79a5..28abfbf 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ /* -// Created by Gregory Gauthier on 06/10/2025. -*/ + * Created by Gregory Gauthier on 06/10/2025. + */ /* main.c - Entry point and main game loop */ /* Compile with: gcc -std=c90 -o cordle src\/\*.c -Iinclude -lncurses */ @@ -53,7 +53,7 @@ void parse_arguments(int argc, char *argv[], char *filename, char *difficulty) { } /* Main game loop */ -int main_game_loop(const int argc, char *argv[]) { +int main_game_loop(int argc, char *argv[]) { WINDOW *stdscr; GameState game; char filename[MAX_FILENAME]; diff --git a/src/ui.c b/src/ui.c index 354695d..43332c1 100644 --- a/src/ui.c +++ b/src/ui.c @@ -1,6 +1,6 @@ /* -// Created by Gregory Gauthier on 06/10/2025. -*/ + * Created by Gregory Gauthier on 06/10/2025. + */ /* ui.c - User interface implementation */ #include "../include/ui.h" #include @@ -15,11 +15,11 @@ static const char *keyboard_rows[3] = { /* Draw game title */ void draw_title(WINDOW *win, int y, const char *difficulty) { char title[256]; - int height, width, x; + int width, x; sprintf(title, "CORDLE - The C90 Wordle Game [%s]", difficulty); - getmaxyx(win, height, width); + width = getmaxx(win); x = (width - strlen(title)) / 2; wattron(win, A_BOLD); @@ -29,11 +29,11 @@ void draw_title(WINDOW *win, int y, const char *difficulty) { /* Draw the game board */ void draw_board(WINDOW *win, GameState *game, int y) { - int height, width, board_x; + int width, board_x; int row, col, x_pos, y_pos; char cell[4]; - getmaxyx(win, height, width); + width = getmaxx(win); board_x = (width - (WORD_LENGTH * 4 - 1)) / 2; for (row = 0; row < MAX_GUESSES; row++) { @@ -75,13 +75,13 @@ void draw_board(WINDOW *win, GameState *game, int y) { /* Draw visual keyboard */ void draw_keyboard(WINDOW *win, GameState *game, int y) { - int height, width; + int width; int row_idx, x, y_pos, i; const char *row; char letter; int status, color; - getmaxyx(win, height, width); + width = getmaxx(win); for (row_idx = 0; row_idx < 3; row_idx++) { row = keyboard_rows[row_idx]; @@ -89,21 +89,28 @@ void draw_keyboard(WINDOW *win, GameState *game, int y) { y_pos = y + row_idx; /* Add indentation for keyboard layout */ - if (row_idx == 1) x += 1; - else if (row_idx == 2) x += 3; + if (row_idx == 1) { + x += 1; + } else if (row_idx == 2) { + x += 3; + } for (i = 0; row[i]; i++) { letter = row[i]; status = game->letter_status[letter - 'A']; switch (status) { - case STATUS_CORRECT: color = COLOR_CORRECT; + case STATUS_CORRECT: + color = COLOR_CORRECT; break; - case STATUS_PRESENT: color = COLOR_PRESENT; + case STATUS_PRESENT: + color = COLOR_PRESENT; break; - case STATUS_ABSENT: color = COLOR_ABSENT; + case STATUS_ABSENT: + color = COLOR_ABSENT; break; - default: color = COLOR_UNUSED; + default: + color = COLOR_UNUSED; break; } @@ -123,9 +130,9 @@ void draw_keyboard(WINDOW *win, GameState *game, int y) { /* Draw centered message */ void draw_message(WINDOW *win, const char *message, const int y, const int color_pair) { - int height, width, x; + int width, x; - getmaxyx(win, height, width); + width = getmaxx(win); x = (width - strlen(message)) / 2; wattron(win, COLOR_PAIR(color_pair)); diff --git a/src/words.c b/src/words.c index 4b634a6..45faef7 100644 --- a/src/words.c +++ b/src/words.c @@ -1,6 +1,6 @@ /* -// Created by Gregory Gauthier on 06/10/2025. -*/ + * Created by Gregory Gauthier on 06/10/2025. + */ /* words.c - Word list management implementation */ #include "../include/words.h" #include