nemo
/
mineur
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

petit refacto

This commit is contained in:
_N3m0 2024-03-12 12:36:29 +01:00
parent 06253110ac
commit ad227321c5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.c
View File

@ -32,6 +32,8 @@ typedef enum GameType {
EXPERT, EXPERT,
} GameType; } GameType;
GameType current_game_type = BEGINNER;
typedef struct Vec2i { typedef struct Vec2i {
int x; int x;
int y; int y;
@ -115,13 +117,13 @@ int count_bomb(int x, int y)
return count; return count;
} }
void fill_game(GameType type) void fill_game(void)
{ {
game_state = PLAYING; game_state = PLAYING;
memset(game, 0, game_cap); memset(game, 0, game_cap);
memset(discover, 0, game_cap); memset(discover, 0, game_cap);
switch (type) { switch (current_game_type) {
case BEGINNER: case BEGINNER:
game_size.x = 9; game_size.x = 9;
game_size.y = 9; game_size.y = 9;
@ -165,6 +167,7 @@ int main(void)
srand(time(NULL)); srand(time(NULL));
SetConfigFlags(FLAG_WINDOW_RESIZABLE); SetConfigFlags(FLAG_WINDOW_RESIZABLE);
SetTraceLogLevel(LOG_ERROR);
menu = (Rectangle){0, 0, screen_width, screen_height - screen_width}; menu = (Rectangle){0, 0, screen_width, screen_height - screen_width};
tile_image_orig = LoadImage("ressources/tile.png"); tile_image_orig = LoadImage("ressources/tile.png");
@ -185,7 +188,7 @@ int main(void)
screen_resize_handle(); screen_resize_handle();
fill_game(BEGINNER); fill_game();
while (!WindowShouldClose()) { while (!WindowShouldClose()) {
if (IsWindowResized()) if (IsWindowResized())
@ -196,7 +199,7 @@ int main(void)
ClearBackground(BLACK); ClearBackground(BLACK);
if (IsKeyPressed(KEY_R)) { if (IsKeyPressed(KEY_R)) {
fill_game(BEGINNER); fill_game();
} }
if (IsKeyPressed(KEY_P)) { if (IsKeyPressed(KEY_P)) {
for (int x=0; x<game_size.x; x++) { for (int x=0; x<game_size.x; x++) {
@ -269,7 +272,7 @@ int main(void)
mouse_x = ((float) (mouse_x - grid_x) / grid_len) * game_size.x; mouse_x = ((float) (mouse_x - grid_x) / grid_len) * game_size.x;
mouse_y = ((float) (mouse_y - grid_y) / grid_len) * game_size.y; mouse_y = ((float) (mouse_y - grid_y) / grid_len) * game_size.y;
if (game_state == PLAYING && IsMouseButtonDown(MOUSE_BUTTON_LEFT)) { if (game_state == PLAYING && IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) {
discover[mouse_y][mouse_x] = 1; discover[mouse_y][mouse_x] = 1;
int count_undiscovered_cell = 0; int count_undiscovered_cell = 0;