AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-14 19:26:09 +00:00
Code Issues Projects Releases Wiki Activity

CMetroid: Implement SuckEnergyFromTarget

Browse Source
This commit is contained in:
Luke Street
2020-05-17 02:46:23 -04:00
parent 6ad1aa79ab
commit 3cafee2abd
5 changed files with 186 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/CDamageInfo.cpp
View File

@@ -12,7 +12,7 @@ CDamageInfo::CDamageInfo(const DataSpec::SShotParam& other)
, xc_radiusDamage(other.radiusDamage)
, x10_radius(other.radius)
, x14_knockback(other.knockback)
, x18_noImmunity(other.noImmunity) {}
, x18_24_noImmunity(other.noImmunity) {}
CDamageInfo& CDamageInfo::operator=(const DataSpec::SShotParam& other) {
x0_weaponMode = CWeaponMode(EWeaponType(other.weaponType), other.charged, other.combo, other.instaKill);
@@ -20,7 +20,7 @@ CDamageInfo& CDamageInfo::operator=(const DataSpec::SShotParam& other) {
xc_radiusDamage = other.radiusDamage;
x10_radius = other.radius;
x14_knockback = other.knockback;
x18_noImmunity = other.noImmunity;
x18_24_noImmunity = other.noImmunity;
return *this;
}
@@ -52,6 +52,6 @@ CDamageInfo::CDamageInfo(const CDamageInfo& other, float dt) {
xc_radiusDamage = x8_damage;
x10_radius = other.x10_radius;
x14_knockback = other.x14_knockback;
x18_noImmunity = true;
x18_24_noImmunity = true;
}
} // namespace urde