fixes

Author: Coronia

docs/locale/zh_CN/LC_MESSAGES/Fixed-or-Improved-Logics.po

@@ -1772,15 +1772,15 @@ msgid ""
 "ExplodeOnWater=false          ; boolean\n"
 "Warhead.Detonate=false        ; boolean\n"
 "WakeAnim=                     ; list of Animation\n"
-"SplashAnims=                  ; List of AnimationTypes\n"
+"SplashAnims=                  ; list of Animation\n"
 "SplashAnims.PickRandom=false  ; boolean\n"
 "ExtraShadow=true              ; boolean\n"
 msgstr ""
 "[SOMEANIM]                    ; AnimationType\n"
 "ExplodeOnWater=false          ; boolean\n"
 "Warhead.Detonate=false        ; boolean\n"
 "WakeAnim=                     ; list of Animation\n"
-"SplashAnims=                  ; List of AnimationTypes\n"
+"SplashAnims=                  ; list of Animation\n"
 "SplashAnims.PickRandom=false  ; boolean\n"
 "ExtraShadow=true              ; boolean\n"
 

src/Ext/TerrainType/Body.cpp

@@ -6,7 +6,6 @@
 #include <TerrainTypeClass.h>
 
 #include <Ext/Anim/Body.h>
-#include <Ext/Scenario/Body.h>
 #include <Utilities/GeneralUtils.h>
 
 TerrainTypeExt::ExtContainer TerrainTypeExt::ExtMap;

src/New/Entity/ShieldClass.cpp

@@ -322,15 +322,12 @@ void ShieldClass::ResponseAttack()
 	}
 }
 
-void ShieldClass::WeaponNullifyAnim(std::vector<AnimTypeClass*>& pHitAnim)
+void ShieldClass::WeaponNullifyAnim(const std::vector<AnimTypeClass*>& pHitAnim)
 {
 	if (this->AreAnimsHidden)
 		return;
 
-	if (pHitAnim.empty())
-		pHitAnim = this->Type->HitAnim;
-
-	AnimExt::CreateRandomAnim(pHitAnim, this->Techno->GetCoords(), this->Techno, nullptr, true, true);
+	AnimExt::CreateRandomAnim((pHitAnim.empty() ? this->Type->HitAnim : pHitAnim), this->Techno->GetCoords(), this->Techno, nullptr, true, true);
 }
 
 bool ShieldClass::CanBeTargeted(WeaponTypeClass* pWeapon) const
@@ -672,7 +669,7 @@ int ShieldClass::GetPercentageAmount(double iStatus)
 	return (int)std::trunc(iStatus);
 }
 
-void ShieldClass::BreakShield(std::vector<AnimTypeClass*>& pBreakAnim, WeaponTypeClass* pBreakWeapon)
+void ShieldClass::BreakShield(const std::vector<AnimTypeClass*>& pBreakAnim, WeaponTypeClass* pBreakWeapon)
 {
 	this->HP = 0;
 
@@ -683,12 +680,7 @@ void ShieldClass::BreakShield(std::vector<AnimTypeClass*>& pBreakAnim, WeaponTyp
 	this->KillAnim();
 
 	if (!this->AreAnimsHidden)
-	{
-		if (pBreakAnim.empty())
-			pBreakAnim = this->Type->BreakAnim;
-
-		AnimExt::CreateRandomAnim(pBreakAnim, this->Techno->Location, this->Techno, nullptr, true, true);
-	}
+		AnimExt::CreateRandomAnim(pBreakAnim.empty() ? this->Type->BreakAnim : pBreakAnim, this->Techno->Location, this->Techno, nullptr, true, true);
 
 	const auto pWeaponType = pBreakWeapon ? pBreakWeapon : this->Type->BreakWeapon;
 	this->LastBreakFrame = Unsorted::CurrentFrame;

src/New/Entity/ShieldClass.h

@@ -20,7 +20,7 @@ class ShieldClass
 	int ReceiveDamage(args_ReceiveDamage* args);
 	bool CanBeTargeted(WeaponTypeClass* pWeapon) const;
 	bool CanBePenetrated(WarheadTypeClass* pWarhead) const;
-	void BreakShield(std::vector<AnimTypeClass*>& pBreakAnim, WeaponTypeClass* pBreakWeapon = nullptr);
+	void BreakShield(const std::vector<AnimTypeClass*>& pBreakAnim, WeaponTypeClass* pBreakWeapon = nullptr);
 
 	void SetRespawn(int duration, double amount, int rate, bool resetTimer);
 	void SetSelfHealing(int duration, double amount, int rate, bool restartInCombat, int restartInCombatDelay, bool resetTimer);
@@ -92,7 +92,7 @@ class ShieldClass
 	void UpdateIdleAnim();
 	AnimTypeClass* GetIdleAnimType();
 
-	void WeaponNullifyAnim(std::vector<AnimTypeClass*>& pHitAnim);
+	void WeaponNullifyAnim(const std::vector<AnimTypeClass*>& pHitAnim);
 	void ResponseAttack();
 
 	void CloakCheck();