PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-16 00:17:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use raw pointers in CWeaponDescription, link it

Browse Source
This commit is contained in:
Henrique Gemignani Passos Lima
2022-11-17 07:13:56 +02:00
parent 19877f6fa2
commit 0e45d77036
5 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MetroidPrime/Weapons/CProjectileInfo.cpp
View File

@@ -18,7 +18,7 @@ float CProjectileInfo::GetProjectileSpeed() const {
float result = 45000.0f;
TToken< CWeaponDescription > token(x0_weaponDescription);
if (!token->x4_IVEC.null()) {
if (token->x4_IVEC) {
CVector3f vec = CVector3f::Zero();
token->x4_IVEC->GetValue(0, vec);
result = vec.Magnitude() / CProjectileWeapon::GetTickPeriod();

31
src/Weapons/CWeaponDescription.cpp
View File

@@ -2,16 +2,41 @@
#include "Kyoto/Alloc/CMemory.hpp"
CWeaponDescription::CWeaponDescription()
: x10_VMD2(false)
: x0_IORN(nullptr)
, x4_IVEC(nullptr)
, x8_PSOV(nullptr)
, xc_PSVM(nullptr)
, x10_VMD2(false)
, x14_PSLT(nullptr)
, x18_PSCL(nullptr)
, x1c_PCOL(nullptr)
, x20_POFS(nullptr)
, x24_OFST(nullptr)
, x28_APSO(false)
, x2a_AP11(false)
, x2b_AP21(false)
, x2c_AS11(false)
, x2d_AS12(false)
, x2e_AS13(false)
, x30_TRAT(nullptr)
, xa4_EWTR(true)
, xa5_LWTR(true)
, xa6_SWTR(true)
, xa8_PJFX(-1) {}
, xa8_PJFX(-1)
, xac_RNGE(nullptr)
, xb0_FOFF(nullptr) {}
CWeaponDescription::~CWeaponDescription() {}
CWeaponDescription::~CWeaponDescription() {
delete x4_IVEC;
delete x0_IORN;
delete xc_PSVM;
delete x8_PSOV;
delete x14_PSLT;
delete x18_PSCL;
delete x1c_PCOL;
delete x20_POFS;
delete x24_OFST;
delete x30_TRAT;
delete xac_RNGE;
delete xb0_FOFF;
}