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

CSeedling: Move skNeedleLocators into the cpp file 

This can be entirely hidden from external view, making it an
implementation detail.
This commit is contained in:
Lioncash 2019-09-28 20:09:53 -04:00
parent 08d4addc70
commit 2a34b6be68
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Runtime/MP1/World/CSeedling.cpp
View File

@ -9,6 +9,26 @@
#include "TCastTo.hpp" // Generated file, do not modify include path #include "TCastTo.hpp" // Generated file, do not modify include path
namespace urde::MP1 { namespace urde::MP1 {
namespace {
const std::string skNeedleLocators[2][6] = {
{
"A_spike1_LCTR_SDK",
"A_spike2_LCTR_SDK",
"A_spike3_LCTR_SDK",
"A_spike4_LCTR_SDK",
"A_spike5_LCTR_SDK",
"A_spike6_LCTR_SDK",
},
{
"B_spike1_LCTR_SDK",
"B_spike2_LCTR_SDK",
"B_spike3_LCTR_SDK",
"B_spike4_LCTR_SDK",
"B_spike5_LCTR_SDK",
"B_spike6_LCTR_SDK",
},
};
} // Anonymous namespace
CSeedling::CSeedling(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CSeedling::CSeedling(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CPatternedInfo& pInfo, const CActorParameters& actParms, CModelData&& mData, const CPatternedInfo& pInfo, const CActorParameters& actParms,
@ -30,23 +50,6 @@ CSeedling::CSeedling(TUniqueId uid, std::string_view name, const CEntityInfo& in
void CSeedling::Accept(IVisitor& visitor) { visitor.Visit(this); } void CSeedling::Accept(IVisitor& visitor) { visitor.Visit(this); }
const std::string CSeedling::skNeedleLocators[2][6] = {{
"A_spike1_LCTR_SDK",
"A_spike2_LCTR_SDK",
"A_spike3_LCTR_SDK",
"A_spike4_LCTR_SDK",
"A_spike5_LCTR_SDK",
"A_spike6_LCTR_SDK",
},
{
"B_spike1_LCTR_SDK",
"B_spike2_LCTR_SDK",
"B_spike3_LCTR_SDK",
"B_spike4_LCTR_SDK",
"B_spike5_LCTR_SDK",
"B_spike6_LCTR_SDK",
}};
void CSeedling::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) { void CSeedling::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
CPatterned::AcceptScriptMsg(msg, uid, mgr); CPatterned::AcceptScriptMsg(msg, uid, mgr);

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

@ -11,7 +11,6 @@
namespace urde::MP1 { namespace urde::MP1 {
class CSeedling : public CWallWalker { class CSeedling : public CWallWalker {
static const std::string skNeedleLocators[2][6];
CPathFindSearch x5d8_searchPath; CPathFindSearch x5d8_searchPath;
std::unique_ptr<CModelData> x6bc_spikeData; std::unique_ptr<CModelData> x6bc_spikeData;
CProjectileInfo x6c0_projectileInfo; CProjectileInfo x6c0_projectileInfo;