primeret/prime
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2026-07-12 18:18:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix CCollisionResponseData::GetWorldCollisionType positioning

Browse Source
This commit is contained in:
Phillip Stephens
2026-01-23 21:12:16 -08:00
parent 2e9b3f9331
commit 45d72dc2dc
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Weapons/CCollisionResponseData.cpp
+7 -7
View File
@@ -217,13 +217,6 @@ CCollisionResponseData::GetDecalDescription(const EWeaponCollisionResponseTypes
return mDecalTokens.at(type);
}
EWeaponCollisionResponseTypes CCollisionResponseData::GetWorldCollisionResponseType(const int idx) {
if (idx >= 0 && idx < ARRAY_SIZE(skWorldMaterialTable)) {
return skWorldMaterialTable[idx];
}
return kWCR_Default;
}
bool CCollisionResponseData::ResponseTypeIsEnemyShielded(const EWeaponCollisionResponseTypes type) {
if (type >= kWCR_Unknown69 && type <= kWCR_AtomicAlphaReflect) {
return true;
@@ -251,6 +244,13 @@ bool CCollisionResponseData::ResponseTypeIsEnemySpecial(const EWeaponCollisionRe
float CCollisionResponseData::GetAudibleRange() const { return mAudibleRange; }
float CCollisionResponseData::GetAudibleFallOff() const { return mAudibleFallOff; }
EWeaponCollisionResponseTypes CCollisionResponseData::GetWorldCollisionResponseType(const int idx) {
if (idx >= 0 && idx < ARRAY_SIZE(skWorldMaterialTable)) {
return skWorldMaterialTable[idx];
}
return kWCR_Default;
}
CFactoryFnReturn FCollisionResponseDataFactory(const SObjectTag& tag, CInputStream& in,
const CVParamTransfer& xfer) {