Merge branch 'master' into experimental

phoenixprojectsoftware · Dec 13, 2024 · 9e593af · 9e593af
2 parents a0205c4 + 3848659
commit 9e593af
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/MapFiles/City.rmf b/MapFiles/City.rmf
diff --git a/MapFiles/Crossfire.rmf b/MapFiles/Crossfire.rmf
diff --git a/MapFiles/Subtarnsit.rmf b/MapFiles/Subtarnsit.rmf
diff --git a/MapFiles/Subtransit.rmf b/MapFiles/Subtransit.rmf
diff --git a/SourceCode/dlls/op4_weapons/CPenguin.cpp b/SourceCode/dlls/op4_weapons/CPenguin.cpp
@@ -173,7 +173,7 @@ void CPenguin::PrimaryAttack()
 			m_pPlayer->SetAnimation(PLAYER_ATTACK1);
 
 #ifndef CLIENT_DLL
-			auto penguin = CBaseEntity::Create("monster_penguin", tr.vecEndPos, pev->v_angle, m_pPlayer->edict());
+			auto penguin = CBaseEntity::Create("monster_penguin", tr.vecEndPos, m_pPlayer->pev->v_angle, m_pPlayer->edict());
 
 			penguin->pev->velocity = m_pPlayer->pev->velocity + (gpGlobals->v_forward * 200);
 #endif

diff --git a/SourceCode/dlls/player.cpp b/SourceCode/dlls/player.cpp
@@ -4685,7 +4685,7 @@ void CBasePlayer :: UpdateClientData( void )
 	}
 	else if (sv_aura_regeneration.value != 0) // IsObserver || !IsAlive
 	{
-		if (pev->armorvalue <= 0)
+		if (pev->armorvalue < 1)
 		{
 			if (!isShieldEmpty && (currentTime - lastShieldSoundTime > 1.0f))
 			{
@@ -4705,7 +4705,7 @@ void CBasePlayer :: UpdateClientData( void )
 			}
 		}
 
-		if (pev->armorvalue < 10)
+		if (pev->armorvalue >= 1 && pev->armorvalue <= 10)
 		{
 			if (!isShieldLow && (currentTime - lastShieldSoundTime > 1.0f)) // 1 second delay
 			{