aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornathansmith117 <thenathansmithsmith@gmail.com>2024-05-14 17:55:17 +0000
committernathansmith117 <thenathansmithsmith@gmail.com>2024-05-14 17:55:17 +0000
commit24126a2f13553d4fd516fb0dc727906b324e9c56 (patch)
tree200ccfe66701510cf175d4bf9258f885f83df1c9 /src
parentcffca0d01bf99d2eb917f6dc923555ffa0011d88 (diff)
downloadPenguinYippies-main.tar.gz
PenguinYippies-main.tar.bz2
PenguinYippies-main.zip
Nap time button addedHEADmain
Diffstat (limited to 'src')
-rw-r--r--src/assets.c3
-rw-r--r--src/assets.h5
-rw-r--r--src/game.c2
-rw-r--r--src/gameScreen.c22
-rw-r--r--src/gameScreen.h1
5 files changed, 25 insertions, 8 deletions
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;