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

CDamageInfo: Make certain constructors constexpr

Browse Source 
Allows eliminating potential runtime static constructors by allowing
file-scope instances to be declared constexpr.
This commit is contained in:
Lioncash
2020-01-31 01:48:04 -05:00
parent 918f1a9fcb
commit 495ff19aad
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/World/CDamageInfo.hpp
View File

@@ -19,7 +19,7 @@ class CDamageInfo {
bool x18_noImmunity = false;
public:
CDamageInfo() = default;
constexpr CDamageInfo() = default;
CDamageInfo(CInputStream& in) {
in.readUint32Big();
x0_weaponMode = CWeaponMode(EWeaponType(in.readUint32Big()));
@@ -28,10 +28,15 @@ public:
x10_radius = in.readFloatBig();
x14_knockback = in.readFloatBig();
}
CDamageInfo(const CWeaponMode& mode, float damage, float radius, float knockback)
constexpr CDamageInfo(const CWeaponMode& mode, float damage, float radius, float knockback)
: x0_weaponMode(mode), x8_damage(damage), xc_radiusDamage(damage), x10_radius(radius), x14_knockback(knockback) {}
CDamageInfo(const CDamageInfo& other) = default;
constexpr CDamageInfo(const CDamageInfo&) = default;
constexpr CDamageInfo& operator=(const CDamageInfo&) = default;
constexpr CDamageInfo(CDamageInfo&&) = default;
constexpr CDamageInfo& operator=(CDamageInfo&&) = default;
CDamageInfo(const CDamageInfo&, float);
CDamageInfo(const DataSpec::SShotParam& other);
CDamageInfo& operator=(const DataSpec::SShotParam& other);