Added sound

TheSofox · Apr 13, 2020 · 7156c83 · 7156c83
1 parent c8c24d6
commit 7156c83
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 9 deletions.
diff --git a/ball.c b/ball.c
@@ -16,14 +16,14 @@ struct Ball initBall(int serve){
 	ball.vel.y = 0;
 	ball.offside = 0;
 	ball.pauseTime = 120;
+	ball.justHit = FALSE;
 	return ball;
 }
 struct Vector2f hitBall(struct Ball ball, struct Player player){
 	ball.vel.x *= -1.05;
 	ball.vel.y += player.vel.y/2;
 
 	ball.vel.y += ((ball.pos.y + 4.0f) - (player.pos.y + 16.0f))/20;
-
 	return ball.vel;
 }
 
@@ -34,11 +34,14 @@ struct Ball updateBall(struct Ball ball, struct Player player1, struct Player pl
 		ball.ppos.y = ball.pos.y;
 		return ball;
 	}
+	ball.justHit = FALSE;
 	if (ball.vel.x<0 && check_ball_hit(ball, player1)){
 		ball.vel = hitBall(ball, player1);
+		ball.justHit = TRUE;
 	}
 	if (ball.vel.x>0 && check_ball_hit(ball, player2)){
 		ball.vel = hitBall(ball, player2);
+		ball.justHit = TRUE;
 	}
 	if (ball.pos.y <= 0){
 		ball.vel.y *= -1;

diff --git a/ball.h b/ball.h
@@ -5,4 +5,4 @@
 extern bool check_ball_hit(struct Ball ball, struct Player player);
 extern struct Ball initBall(int serve);
 extern struct Vector2f hitBall(struct Ball ball, struct Player player);
-extern struct Ball updateBall(struct Ball ball, struct Player player1, struct Player player2);
+extern struct Ball updateBall(struct Ball ball, struct Player player1, struct Player player2);
diff --git a/constants.h b/constants.h
@@ -16,7 +16,7 @@
 #define SWING_TIME  10
 
 
-#define SCORE_LIMIT  2
+#define SCORE_LIMIT  5
 
 /*
 Notes regarding SGDK API changes:

diff --git a/main.c b/main.c
@@ -90,6 +90,7 @@ int main(){
 	u16 joyInput1;
 	u16 joyInput2;
 
+	SND_startPlay_4PCM_ENV(soundTheme, sizeof(soundTheme), SOUND_PCM_CH2, FALSE);
 	while(1)
 	{
 		if(gameState.screen == 1){
@@ -124,27 +125,38 @@ int main(){
 				player1 = updatePlayer(player1, joyInput1);
 				player2 = updatePlayer(player2, joyInput2);
 
-				//VDP_drawText(3, 1, 2);
 
 				ball = updateBall(ball, player1, player2);
 
+				if(player1.hitFrame || player2.hitFrame){
+					if(ball.justHit)
+						SND_startPlay_4PCM_ENV(soundSwipe, sizeof(soundSwipe), SOUND_PCM_CH2, FALSE);
+					else
+						SND_startPlay_4PCM_ENV(soundSwoosh, sizeof(soundSwoosh), SOUND_PCM_CH2, FALSE);
+
+				}
+
 				if(ball.offside!=0){
+
+                    SND_startPlay_4PCM_ENV(soundMiss, sizeof(soundMiss), SOUND_PCM_CH2, FALSE);
 					if(ball.offside>0){
 						player1 = player_add_score(player1);
 						gameState.serve = 1;
-						if(player1.score>=2){
+						if(player1.score>=SCORE_LIMIT){
 							player1 = player_set_winner(player1);
 							player2 = player_set_loser(player2);
 							gameState.winScreen = TRUE;
+							SND_startPlay_4PCM_ENV(soundVictory, sizeof(soundVictory), SOUND_PCM_CH2, FALSE);
 						}
 					}
 					if(ball.offside<0){
 						player2 = player_add_score(player2);
 						gameState.serve = -1;
-						if(player2.score>=2){
+						if(player2.score>=SCORE_LIMIT){
 							player2 = player_set_winner(player2);
 							player1 = player_set_loser(player1);
 							gameState.winScreen = TRUE;
+							SND_startPlay_4PCM_ENV(soundVictory, sizeof(soundVictory), SOUND_PCM_CH2, FALSE);
 						}
 					}
 					//
@@ -162,7 +174,7 @@ int main(){
 				drawInt(player1.score,18,2,1);
 				drawInt(player2.score,22,2,1);
 
-				
+
 				SPR_setHFlip (ballSprite, ball.vel.x>0);
 				SPR_setPosition(ballSprite, ball.ppos.x,ball.ppos.y);
 

diff --git a/player.c b/player.c
@@ -34,6 +34,7 @@ struct Player updatePlayer(struct Player player, u16 input){
 		player.vel.y = 0;
 	player.pos.y += player.vel.y;
 
+
 
 	if(player.pos.y<0){
 		player.pos.y = 0;

diff --git a/player.h b/player.h
@@ -4,4 +4,4 @@ extern struct Player initPlayer(int pno);
 extern struct Player updatePlayer(struct Player player, u16 input);
 extern struct Player player_add_score(struct Player player);
 extern struct Player player_set_winner(struct Player player);
-extern struct Player player_set_loser(struct Player player);
+extern struct Player player_set_loser(struct Player player);
diff --git a/res/audio/miss.wav b/res/audio/miss.wav
diff --git a/res/audio/swipe.wav b/res/audio/swipe.wav
diff --git a/res/audio/swoosh.wav b/res/audio/swoosh.wav
diff --git a/res/audio/theme.wav b/res/audio/theme.wav
diff --git a/res/audio/victory.wav b/res/audio/victory.wav
diff --git a/res/resources.res b/res/resources.res
@@ -1,4 +1,10 @@
 SPRITE	imgball	"sprites/ball.png" 1	1	NONE
 SPRITE	imgplayer	"sprites/player.png" 4	4	0
 IMAGE   imgcave    "tiles/cave.bmp"    0
-IMAGE   imglogo "logo.png"  0
+IMAGE   imglogo "logo.png"  0
+
+WAV soundMiss "audio/miss.wav" 2
+WAV soundSwipe "audio/swipe.wav" 2
+WAV soundTheme "audio/theme.wav" 2
+WAV soundVictory "audio/victory.wav" 2
+WAV soundSwoosh "audio/swoosh.wav" 2
diff --git a/structs.h b/structs.h
@@ -33,6 +33,7 @@ struct Ball{
 	struct Vector2f vel;
 	int pauseTime;
 	int offside;
+	bool justHit;
 };
 
 struct GameState{