Weapon Charging Sound

Now the sound stops when you release the key early enough for the weapon not to be charged.
ch0m5 · May 7, 2018 · 2b71481 · 2b71481
1 parent e4609ff
commit 2b71481
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Andro_Dunos/ModulePlayer1.cpp b/Andro_Dunos/ModulePlayer1.cpp
@@ -882,13 +882,13 @@ update_status ModulePlayer1::Update()	// Moves the ship and changes it's printed
 				currentYellow++;
 
 			// Charging weapon sounds
-			if (bluePower > LEVEL_1 && weaponChargeTimer < SDL_GetTicks() - 1700 && weaponChargingStage == NOT_CHARGING)
+			if (bluePower > LEVEL_1 && weaponChargeTimer < SDL_GetTicks() - 1300 && weaponChargingStage == NOT_CHARGING)
 			{
 				Mix_PlayChannel(1, typeCharging, 0);
 				weaponChargingStage = CHARGING;
 			}
 
-			if (bluePower > LEVEL_1 && weaponChargeTimer < SDL_GetTicks() - 4800 && weaponChargingStage == CHARGING)
+			if (bluePower > LEVEL_1 && weaponChargeTimer < SDL_GetTicks() - 4400 && weaponChargingStage == CHARGING)
 			{
 				Mix_PlayChannel(1, typeCharged, -1);
 				weaponChargingStage = CHARGED;
@@ -900,7 +900,7 @@ update_status ModulePlayer1::Update()	// Moves the ship and changes it's printed
 		{
 			weaponChargingStage = NOT_CHARGING;
 
-			if (weaponChargeTimer < SDL_GetTicks() - 2000 && bluePower > LEVEL_1)
+			if (weaponChargeTimer < SDL_GetTicks() - 2200 && bluePower > LEVEL_1)
 			{
 				switch (type)
 				{
@@ -967,6 +967,9 @@ update_status ModulePlayer1::Update()	// Moves the ship and changes it's printed
 
 				bluePower--;
 			}
+
+			else if (weaponChargeTimer < SDL_GetTicks() - 1300 && bluePower > LEVEL_1)
+				Mix_HaltChannel(1);
 		}
 
 		//GodMode Function

diff --git a/Andro_Dunos/ModulePlayer2.cpp b/Andro_Dunos/ModulePlayer2.cpp
@@ -879,13 +879,13 @@ update_status ModulePlayer2::Update()	// Moves the ship and changes it's printed
 				currentYellow++;
 
 			// Charging weapon sounds
-			if (bluePower > LEVEL_1 && weaponChargeTimer < SDL_GetTicks() - 1700 && weaponChargingStage == NOT_CHARGING)
+			if (bluePower > LEVEL_1 && weaponChargeTimer < SDL_GetTicks() - 1300 && weaponChargingStage == NOT_CHARGING)
 			{
 				Mix_PlayChannel(3, typeCharging, 0);
 				weaponChargingStage = CHARGING;
 			}
 
-			if (bluePower > LEVEL_1 && weaponChargeTimer < SDL_GetTicks() - 4800 && weaponChargingStage == CHARGING)
+			if (bluePower > LEVEL_1 && weaponChargeTimer < SDL_GetTicks() - 4400 && weaponChargingStage == CHARGING)
 			{
 				Mix_PlayChannel(3, typeCharged, -1);
 				weaponChargingStage = CHARGED;
@@ -897,7 +897,7 @@ update_status ModulePlayer2::Update()	// Moves the ship and changes it's printed
 		{
 			weaponChargingStage = NOT_CHARGING;
 
-			if (weaponChargeTimer < SDL_GetTicks() - 2000 && bluePower > LEVEL_1)
+			if (weaponChargeTimer < SDL_GetTicks() - 2200 && bluePower > LEVEL_1)
 			{
 				switch (type)
 				{
@@ -964,6 +964,9 @@ update_status ModulePlayer2::Update()	// Moves the ship and changes it's printed
 
 				bluePower--;
 			}
+
+			else if (weaponChargeTimer < SDL_GetTicks() - 1300 && bluePower > LEVEL_1)
+				Mix_HaltChannel(3);
 		}
 
 		//GodMode Function