AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CSegStatementSet: Make use of std::array 

Same behavior, but without implicit array to pointer decay.
This commit is contained in:
Lioncash 2020-04-01 00:36:47 -04:00
parent c02d5a91b8
commit 233b2ccbbf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Character/CSegStatementSet.hpp
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <array>
#include "Runtime/Character/CAnimPerSegmentData.hpp" #include "Runtime/Character/CAnimPerSegmentData.hpp"
#include "Runtime/Character/CSegId.hpp" #include "Runtime/Character/CSegId.hpp"
@ -11,7 +13,7 @@ class CSegStatementSet {
private: private:
/* Used to be a pointer to arbitrary subclass-provided storage, /* Used to be a pointer to arbitrary subclass-provided storage,
* now it's a self-stored array */ * now it's a self-stored array */
CAnimPerSegmentData x4_segData[100]; std::array<CAnimPerSegmentData, 100> x4_segData;
public: public:
void Add(const CSegIdList& list, const CCharLayoutInfo& layout, const CSegStatementSet& other, float weight); void Add(const CSegIdList& list, const CCharLayoutInfo& layout, const CSegStatementSet& other, float weight);