Merge branch 'master' of https://github.com/ch0m5/Project_1

ch0m5 · Apr 22, 2018 · 8a6e342 · 8a6e342
2 parents fcb4c18 + 6a10ae4
commit 8a6e342
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Andro_Dunos/PowerUp_Bonus.cpp b/Andro_Dunos/PowerUp_Bonus.cpp
@@ -150,11 +150,11 @@ void PowerUp_Bonus::OnCollision(Collider* collider)
 		{
 			Mix_PlayChannel(2, App->player1->powerUp, 0);
 			App->UI->player1Score += score;
-			if (blue == true)
+			if (blue == true && App->player1->bluePower < LEVEL_7)
 			{
 				App->player1->bluePower++;
 			}
-			else if (orange == true)
+			else if (orange == true && App->player1->orangePower < LEVEL_5)
 			{
 				App->player1->orangePower++;
 			}
@@ -163,11 +163,11 @@ void PowerUp_Bonus::OnCollision(Collider* collider)
 		{
 			Mix_PlayChannel(2, App->player2->powerUp, 0);
 			App->UI->player2Score += score;
-			if (blue == true)
+			if (blue == true && App->player2->bluePower < LEVEL_7)
 			{
 				App->player2->bluePower++;
 			}
-			else if (orange == true)
+			else if (orange == true && App->player2->orangePower < LEVEL_5)
 			{
 				App->player2->orangePower++;
 			}