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

CAtomicAlpha: Make skBombLocators an internal array 

This is only used within the cpp file, so we can relocate its definition
there to make it fully internally-linked.
This commit is contained in:
Lioncash 2019-10-03 00:32:17 -04:00
parent ee791d6a37
commit c882003d37
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/MP1/World/CAtomicAlpha.cpp
View File

@ -1,5 +1,7 @@
#include "Runtime/MP1/World/CAtomicAlpha.hpp" #include "Runtime/MP1/World/CAtomicAlpha.hpp"
#include <array>
#include "Runtime/CStateManager.hpp" #include "Runtime/CStateManager.hpp"
#include "Runtime/Weapon/CPlayerGun.hpp" #include "Runtime/Weapon/CPlayerGun.hpp"
#include "Runtime/World/CGameArea.hpp" #include "Runtime/World/CGameArea.hpp"
@ -8,8 +10,12 @@
#include "Runtime/World/CWorld.hpp" #include "Runtime/World/CWorld.hpp"
namespace urde::MP1 { namespace urde::MP1 {
const std::string_view CAtomicAlpha::skBombLocators[4] = {"bomb1_LCTR"sv, "bomb2_LCTR"sv, "bomb3_LCTR"sv, constexpr std::array skBombLocators{
"bomb4_LCTR"sv}; "bomb1_LCTR"sv,
"bomb2_LCTR"sv,
"bomb3_LCTR"sv,
"bomb4_LCTR"sv,
};
CAtomicAlpha::CAtomicAlpha(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CAtomicAlpha::CAtomicAlpha(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CActorParameters& actParms, const CPatternedInfo& pInfo, CModelData&& mData, const CActorParameters& actParms, const CPatternedInfo& pInfo,

1
Runtime/MP1/World/CAtomicAlpha.hpp
View File

@ -9,7 +9,6 @@
namespace urde::MP1 { namespace urde::MP1 {
class CAtomicAlpha : public CPatterned { class CAtomicAlpha : public CPatterned {
static const std::string_view skBombLocators[4];
static constexpr u32 skBombCount = 4; static constexpr u32 skBombCount = 4;
struct SBomb { struct SBomb {
std::string x0_locatorName; std::string x0_locatorName;