Merge branch 'master' of https://github.com/phoenixprojectsoftware/Au…

…ra-SE
phoenixprojectsoftware · Sep 3, 2024 · 4231094 · 4231094
2 parents c8739d6 + cc1ae50
commit 4231094
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/binary/dlls/client.cpp b/binary/dlls/client.cpp
@@ -887,6 +887,9 @@ void ClientPrecache( void )
 	PRECACHE_SOUND("player/geiger2.wav");
 	PRECACHE_SOUND("player/geiger1.wav");
 
+	// BlueNightHawk : Suit Energy Regeneration
+	PRECACHE_SOUND("debris/beamstart15.wav");
+	PRECACHE_SOUND("player/shield_empty.wav");
 	PRECACHE_SOUND("player/shield_charge.wav");
 	PRECACHE_SOUND("items/suitchargeno1.wav");
 	PRECACHE_SOUND("items/suitchargeok1.wav");

diff --git a/binary/dlls/player.cpp b/binary/dlls/player.cpp
@@ -4670,7 +4670,8 @@ void CBasePlayer :: UpdateClientData( void )
 		else if (!m_fRegenOn) // when shield starts recharging
 		{
 			m_fRegenOn = true;
-			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/suitchargeok1.wav", 0.85, ATTN_NORM);
+			EMIT_SOUND(ENT(pev), CHAN_AUTO, "items/suitchargeok1.wav", 0.85, ATTN_NORM);
+			STOP_SOUND(ENT(pev), CHAN_AUTO, "player/shield_empty.wav");
 		}
 		else // as it's recharging
 		{

diff --git a/binary/dlls/sound.cpp b/binary/dlls/sound.cpp
@@ -1745,10 +1745,11 @@ float TEXTURETYPE_PlaySound(TraceResult *ptr,  Vector vecSrc, Vector vecEnd, int
 		if (iBulletType == BULLET_PLAYER_CROWBAR)
 			return 0.0; // crowbar already makes this sound
 		fvol = 1.0;	fvolbar = 0.2;
-		rgsz[0] = "weapons/bullet_hit1.wav";
-		rgsz[1] = "weapons/bullet_hit2.wav";
+		//rgsz[0] = "weapons/bullet_hit1.wav";
+		//rgsz[1] = "weapons/bullet_hit2.wav";
+		rgsz[0] = "player/hitsound.wav";
 		fattn = 1.0;
-		cnt = 2;
+		cnt = 1;
 		break;
 	}
 

diff --git a/binary/dlls/weapons.cpp b/binary/dlls/weapons.cpp
@@ -439,6 +439,8 @@ void W_Precache(void)
 
 	PRECACHE_SOUND ("weapons/bullet_hit1.wav");	// hit by bullet
 	PRECACHE_SOUND ("weapons/bullet_hit2.wav");	// hit by bullet
+
+	PRECACHE_SOUND("player/hitsound.wav");
 
 	PRECACHE_SOUND ("items/weapondrop1.wav");// weapon falls to the ground
 

diff --git a/maps/.gitignore b/maps/.gitignore
@@ -3,4 +3,5 @@
 *.prt
 *.max
 *.bsp
-!prefabs/prefabs.map
+!prefabs/prefabs.map
+!Leveled.map
diff --git a/maps/Doublefort.rmf b/maps/Doublefort.rmf
diff --git a/maps/Guardian.rmf b/maps/Guardian.rmf