From 9b2eff2b58ea06b7a18d466c0210c25141dea0e0 Mon Sep 17 00:00:00 2001 From: Mark B Date: Sun, 23 Oct 2022 16:51:39 -0400 Subject: [PATCH] changed the amount of shoots on screen from 3 to 5 --- src/Gameplay.c | 1 + src/Gameplay.h | 2 +- src/LevelSel.c | 6 +++--- src/Options.c | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/Gameplay.c b/src/Gameplay.c index aa78d66..194e982 100644 --- a/src/Gameplay.c +++ b/src/Gameplay.c @@ -327,6 +327,7 @@ void UpdateGameplayScreen(void) if (CheckCollisionRecs(shoot[j].hitbox, fireworks[i].hitbox) && shoot[j].active) { if (!mute) PlaySoundMulti(enemy.fxhit); fireworks[i].active = 0; + scoreTimer += 300; fireworkAmount--; } } diff --git a/src/Gameplay.h b/src/Gameplay.h index f81c2c3..e0fc7a4 100644 --- a/src/Gameplay.h +++ b/src/Gameplay.h @@ -10,7 +10,7 @@ #define GAMEPLAY_HEADER #define MAX_FIREWORKS 10 -#define MAX_SHOOTS 3 +#define MAX_SHOOTS 5 struct Actor { float speed; diff --git a/src/LevelSel.c b/src/LevelSel.c index 268f407..6f1507a 100644 --- a/src/LevelSel.c +++ b/src/LevelSel.c @@ -46,14 +46,14 @@ void DrawLevelSelScreen(void) else DrawText(TextFormat("SCORE: %i", score), 10, 65, 30, BLUE); if (levelSelected == 0) DrawText("1", 100, 220, 60, WHITE); - else DrawText("1", 100, 220, 60, BLUE); + else DrawText("1", 100, 220, 60, GREEN); if (levelSelected == 1) DrawText("2", 200, 220, 60, WHITE); - else if (levelunlocked[1]) DrawText("2", 200, 220, 60, BLUE); + else if (levelunlocked[1]) DrawText("2", 200, 220, 60, GREEN); else DrawText("2", 200, 220, 60, GRAY); if (levelSelected == 2) DrawText("3", 300, 220, 60, WHITE); - else if (levelunlocked[2]) DrawText("3", 300, 220, 60, BLUE); + else if (levelunlocked[2]) DrawText("3", 300, 220, 60, RED); else DrawText("3", 300, 220, 60, GRAY); // printf("%d, %d, %d\n", levelunlocked[0], levelunlocked[1], levelunlocked[2]); diff --git a/src/Options.c b/src/Options.c index 983d0a5..3cc365a 100644 --- a/src/Options.c +++ b/src/Options.c @@ -37,23 +37,23 @@ void DrawOptionsScreen(void) { DrawTexture(background, 0, 0, DARKGRAY); DrawTextEx(ZadoBold, "OPTIONS", (Vector2){ 300, 20 }, 50, 2, BLUE); - if (optionsSelected == 0) DrawTextEx(ZadoBold, "Back", (Vector2){ 20, 170 }, 40, 2, WHITE); - else DrawTextEx(ZadoBold, "Back", (Vector2){ 20, 170 }, 40, 2, BLUE); + if (optionsSelected == 0) DrawText("Back", 20, 170, 40, WHITE); + else DrawText("Back", 20, 170, 40, RED); if (optionsSelected == -1) { - DrawTextEx(ZadoBold, "Mute", (Vector2) { 20, 220 }, 40, 2, WHITE); - DrawTextEx(ZadoBold, TextFormat("<%i>", mute), (Vector2){ 250, 220 }, 40, 2, WHITE); + DrawText("Mute", 20, 220, 40, WHITE); + DrawText(TextFormat("<%i>", mute), 250, 220, 40, WHITE); } else { - DrawTextEx(ZadoBold, "Mute", (Vector2) { 20, 220 }, 40, 2, BLUE); - DrawTextEx(ZadoBold, TextFormat("<%i>", mute), (Vector2){ 250, 220 }, 40, 2, BLUE); + DrawText("Mute", 20, 220, 40, BLUE); + DrawText(TextFormat("<%i>", mute), 250, 220, 40, BLUE); } if (optionsSelected == -2) { - DrawTextEx(ZadoBold, "Fullscreen", (Vector2){ 20, 270 }, 40, 2, WHITE); - DrawTextEx(ZadoBold, TextFormat("<%i>", fullscreen), (Vector2){ 250, 270 }, 40, 2, WHITE); + DrawText("Fullscreen", 20, 270, 40, WHITE); + DrawText(TextFormat("<%i>", fullscreen), 250, 270, 40, WHITE); } else { - DrawTextEx(ZadoBold, "Fullscreen", (Vector2){ 20, 270 }, 40, 2, BLUE); - DrawTextEx(ZadoBold, TextFormat("<%i>", fullscreen), (Vector2){ 250, 270 }, 40, 2, BLUE); + DrawText("Fullscreen", 20, 270, 40, BLUE); + DrawText(TextFormat("<%i>", fullscreen), 250, 270, 40, BLUE); } }