AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-06-07 01:53:29 +00:00
Code Issues Projects Releases Wiki Activity

CWarWasp: Make use of std::array where applicable

Browse Source 
Same behavior, no array to pointer decay.
This commit is contained in:
Lioncash 2020-04-12 11:23:03 -04:00
parent cb857bd737
commit f74471f603
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/World/CWarWasp.cpp
View File

@ -1,5 +1,7 @@
#include "Runtime/MP1/World/CWarWasp.hpp" #include "Runtime/MP1/World/CWarWasp.hpp"
#include <array>
#include "Runtime/CSimplePool.hpp" #include "Runtime/CSimplePool.hpp"
#include "Runtime/GameGlobalObjects.hpp" #include "Runtime/GameGlobalObjects.hpp"
#include "Runtime/Character/CCharLayoutInfo.hpp" #include "Runtime/Character/CCharLayoutInfo.hpp"
@ -883,9 +885,9 @@ float CWarWasp::GetTeamZStratum(s32 team) const {
return 0.f; return 0.f;
} }
static const float Table[] = {0.4f, 0.6f, 1.f};
float CWarWasp::CalcSeekMagnitude(const CStateManager& mgr) const { float CWarWasp::CalcSeekMagnitude(const CStateManager& mgr) const {
static constexpr std::array Table{0.4f, 0.6f, 1.f};
const float ret = ((x708_circleAttackTeam >= 0 && x708_circleAttackTeam < 3) ? Table[x708_circleAttackTeam] : 1.f) * 0.9f; const float ret = ((x708_circleAttackTeam >= 0 && x708_circleAttackTeam < 3) ? Table[x708_circleAttackTeam] : 1.f) * 0.9f;
if (TCastToConstPtr<CTeamAiMgr> aimgr = mgr.GetObjectById(x674_aiMgr)) { if (TCastToConstPtr<CTeamAiMgr> aimgr = mgr.GetObjectById(x674_aiMgr)) {
if (aimgr->IsPartOfTeam(GetUniqueId())) { if (aimgr->IsPartOfTeam(GetUniqueId())) {