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

Merge pull request #249 from lioncash/list 

CObjectList: Make use of std::array where applicable
This commit is contained in:
Luke Street 2020-03-18 01:05:42 -04:00 committed by GitHub
parent 44325a5ad4 9e6f86cb16
commit 93be0fbc72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/CObjectList.hpp
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <array>
#include "Runtime/RetroTypes.hpp" #include "Runtime/RetroTypes.hpp"
#include "Runtime/World/CEntity.hpp" #include "Runtime/World/CEntity.hpp"
@ -25,7 +27,7 @@ class CObjectList {
s16 next = -1; s16 next = -1;
s16 prev = -1; s16 prev = -1;
}; };
SObjectListEntry x0_list[1024]; // was an rstl::prereserved_vector std::array<SObjectListEntry, 1024> x0_list; // was an rstl::prereserved_vector
EGameObjectList x2004_listEnum; EGameObjectList x2004_listEnum;
s16 x2008_firstId = -1; s16 x2008_firstId = -1;
u16 x200a_count = 0; u16 x200a_count = 0;