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

CPlayerGun: Make use of std::array where applicable

Browse Source
This commit is contained in:
Lioncash
2020-03-09 16:17:34 -04:00
parent 1838e43078
commit 73f11a6132
2 changed files with 73 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/Weapon/CPlayerGun.hpp
View File

@@ -1,5 +1,6 @@
#pragma once
#include <array>
#include <memory>
#include <vector>
@@ -215,7 +216,7 @@ private:
std::unique_ptr<CWaveBeam> x754_waveBeam;
std::unique_ptr<CPlasmaBeam> x758_plasmaBeam;
std::unique_ptr<CPhazonBeam> x75c_phazonBeam;
CGunWeapon* x760_selectableBeams[4] = {}; // Used to be reserved_vector
std::array<CGunWeapon*, 4> x760_selectableBeams{}; // Used to be reserved_vector
std::unique_ptr<CElementGen> x774_holoTransitionGen;
std::unique_ptr<CElementGen> x77c_comboXferGen;
rstl::reserved_vector<rstl::reserved_vector<TLockedToken<CGenDescription>, 2>, 2> x784_bombEffects;