2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00

CAutoMapper: Use std::array where applicable

This commit is contained in:
Lioncash
2019-10-01 22:25:15 -04:00
parent a5d18002be
commit 23ca919c18
2 changed files with 42 additions and 38 deletions

View File

@@ -1,5 +1,6 @@
#pragma once
#include <array>
#include <list>
#include <memory>
#include <optional>
@@ -144,7 +145,7 @@ private:
u32 x9c_worldIdx = 0;
TAreaId xa0_curAreaId;
TAreaId xa4_otherAreaId;
SAutoMapperRenderState xa8_renderStates[3]; // xa8, x104, x160; current, next, prev
std::array<SAutoMapperRenderState, 3> xa8_renderStates; // xa8, x104, x160; current, next, prev
EAutoMapperState x1bc_state = EAutoMapperState::MiniMap;
EAutoMapperState x1c0_nextState = EAutoMapperState::MiniMap;
float x1c4_interpDur = 0.f;