From 24126a2f13553d4fd516fb0dc727906b324e9c56 Mon Sep 17 00:00:00 2001 From: nathansmith117 Date: Tue, 14 May 2024 11:55:17 -0600 Subject: Nap time button added --- assets/napTimeButton.png | Bin 0 -> 11393 bytes src/assets.c | 3 ++- src/assets.h | 5 +++-- src/game.c | 2 +- src/gameScreen.c | 22 ++++++++++++++++++---- src/gameScreen.h | 1 + 6 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 assets/napTimeButton.png diff --git a/assets/napTimeButton.png b/assets/napTimeButton.png new file mode 100644 index 0000000..53e8d18 Binary files /dev/null and b/assets/napTimeButton.png differ diff --git a/src/assets.c b/src/assets.c index 3a80194..f837390 100644 --- a/src/assets.c +++ b/src/assets.c @@ -13,7 +13,8 @@ const char textureAssetsNames[TEXTURE_ASSET_COUNT][ASSETS_NAME_MAX] = { "booperTool.png", "penguinBillboard.png", "toGackIcon.png", - "gackPenguin.png" + "gackPenguin.png", + "napTimeButton.png" }; const char animationAssetsNames[ANIMATION_ASSET_COUNT][ASSETS_NAME_MAX] = { diff --git a/src/assets.h b/src/assets.h index 84a4ef9..c0aadc1 100644 --- a/src/assets.h +++ b/src/assets.h @@ -3,7 +3,7 @@ #define ASSETS_NAME_MAX 100 -#define TEXTURE_ASSET_COUNT 12 +#define TEXTURE_ASSET_COUNT 13 #define ANIMATION_ASSET_COUNT 4 #ifndef ASSETS_H @@ -26,7 +26,8 @@ enum BOOPER_TOOL_TEXTURE, PENGUIN_BILLBOARD_TEXTURE, TO_GACK_ICON_TEXTURE, - GACK_PENGUIN_TEXTURE + GACK_PENGUIN_TEXTURE, + NAP_TIME_TEXTURE }; enum diff --git a/src/game.c b/src/game.c index df8a57b..6f74c58 100644 --- a/src/game.c +++ b/src/game.c @@ -29,7 +29,7 @@ void initGame(Game* game) game->madeWithUnity = createAnimation(&game->assets.animations[MADE_WITH_UNITY_ANIMATION], 0.2); game->madeWithUnity.repeat = false; - playAnimation(&game->madeWithUnity); + //playAnimation(&game->madeWithUnity); } void updateGame(Game* game) diff --git a/src/gameScreen.c b/src/gameScreen.c index bbe5a65..68c1301 100644 --- a/src/gameScreen.c +++ b/src/gameScreen.c @@ -41,6 +41,15 @@ void initGameScreen(GameScreen* gameScreen, Game* game) BLACK ); + // Nap Time stuff. + gameScreen->napTimeButton = createTexturedButton( + &assets->textures[NAP_TIME_TEXTURE], + (Rectangle){700.0, 5.0, 100.0, 50.0}, + "", + WHITE, + BLACK + ); + gameScreen->nextShootingStoneCount = RUN_SHOOTER_GAME_COUNT_START; initShop(&gameScreen->shop, game); @@ -223,12 +232,17 @@ void updateGameScreen(GameScreen* gameScreen, Game* game) snprintf(stonesBuf, sizeof(stonesBuf), "%d", game->stones); DrawText(stonesBuf, 40.0, 5.0, 30, BLACK); - // Shooter game time. + // Shooter game stuff. if (game->stones >= gameScreen->nextShootingStoneCount) { - ++game->stones; - enterShooterScreen(game); - gameScreen->nextShootingStoneCount *= 5.0; + + // Show button to enter nap time. + if (updateTexturedButton(&gameScreen->napTimeButton)) + { + ++game->stones; + enterShooterScreen(game); + gameScreen->nextShootingStoneCount *= 5.0; + } } char nextShooterBuf[60]; diff --git a/src/gameScreen.h b/src/gameScreen.h index cbfbc75..dd8bf98 100644 --- a/src/gameScreen.h +++ b/src/gameScreen.h @@ -35,6 +35,7 @@ typedef struct GameScreen { ToolId tool; + TexturedButton napTimeButton; int nextShootingStoneCount; } GameScreen; -- cgit v1.2.3