AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-17 09:27:04 +00:00
Code Issues Projects Releases Wiki Activity

string_view refactor

Browse Source
This commit is contained in:
Jack Andersen
2017-11-12 20:19:18 -10:00
parent 742ab2514f
commit f7ec7bdc0c
345 changed files with 907 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/CFrontEndUI.cpp
View File

@@ -704,7 +704,7 @@ CFrontEndUI::SFileMenuOption CFrontEndUI::SNewFileSelectFrame::FindFileSelectOpt
return ret;
}
void CFrontEndUI::SNewFileSelectFrame::StartTextAnimating(CGuiTextPane* text, const std::u16string& str, float chRate)
void CFrontEndUI::SNewFileSelectFrame::StartTextAnimating(CGuiTextPane* text, std::u16string_view str, float chRate)
{
text->TextSupport().SetText(str);
text->TextSupport().SetTypeWriteEffectOptions(true, 0.1f, chRate);
@@ -1239,7 +1239,7 @@ void CFrontEndUI::SFusionBonusFrame::DoAdvance(CGuiTableGroup* caller)
}
}
void CFrontEndUI::SGuiTextPair::SetPairText(const std::u16string& str)
void CFrontEndUI::SGuiTextPair::SetPairText(std::u16string_view str)
{
x0_panes[0]->TextSupport().SetText(str);
x0_panes[1]->TextSupport().SetText(str);
@@ -1253,7 +1253,7 @@ CFrontEndUI::SGuiTextPair CFrontEndUI::FindTextPanePair(CGuiFrame* frame, const
return ret;
}
void CFrontEndUI::FindAndSetPairText(CGuiFrame* frame, const char* name, const std::u16string& str)
void CFrontEndUI::FindAndSetPairText(CGuiFrame* frame, const char* name, std::u16string_view str)
{
CGuiTextPane* w1 = static_cast<CGuiTextPane*>(frame->FindWidget(name));
w1->TextSupport().SetText(str);

6
Runtime/MP1/CFrontEndUI.hpp
View File

@@ -80,10 +80,10 @@ public:
struct SGuiTextPair
{
CGuiTextPane* x0_panes[2] = {};
void SetPairText(const std::u16string& str);
void SetPairText(std::u16string_view str);
};
static SGuiTextPair FindTextPanePair(CGuiFrame* frame, const char* name);
static void FindAndSetPairText(CGuiFrame* frame, const char* name, const std::u16string& str);
static void FindAndSetPairText(CGuiFrame* frame, const char* name, std::u16string_view str);
struct SFileMenuOption
{
@@ -172,7 +172,7 @@ public:
void DoFileMenuAdvance(CGuiTableGroup* caller);
static SFileMenuOption FindFileSelectOption(CGuiFrame* frame, int idx);
static void StartTextAnimating(CGuiTextPane* text, const std::u16string& str, float chRate);
static void StartTextAnimating(CGuiTextPane* text, std::u16string_view str, float chRate);
};
struct SFusionBonusFrame

2
Runtime/MP1/CMemoryCardDriver.cpp
View File

@@ -145,7 +145,7 @@ void CMemoryCardDriver::SGameFileSlot::LoadGameState(u32 idx)
static_cast<MP1::CMain*>(g_Main)->StreamNewGameState(r, idx);
}
CMemoryCardDriver::SFileInfo::SFileInfo(kabufuda::ECardSlot port, const std::string& name)
CMemoryCardDriver::SFileInfo::SFileInfo(kabufuda::ECardSlot port, std::string_view name)
: x0_fileInfo(port), x14_name(name) {}
CMemoryCardDriver::CMemoryCardDriver(kabufuda::ECardSlot cardPort, CAssetId saveBanner,

2
Runtime/MP1/CMemoryCardDriver.hpp
View File

@@ -78,7 +78,7 @@ private:
std::string x14_name;
std::vector<u8> x24_saveFileData;
std::vector<u8> x34_saveData;
SFileInfo(kabufuda::ECardSlot cardPort, const std::string& name);
SFileInfo(kabufuda::ECardSlot cardPort, std::string_view name);
kabufuda::ECardResult Open();
kabufuda::ECardResult Close();
kabufuda::ECardSlot GetFileCardPort() const { return x0_fileInfo.slot; }

4
Runtime/MP1/CSamusHud.cpp
View File

@@ -1769,7 +1769,7 @@ zeus::CTransform CSamusHud::BuildFinalCameraTransform(const zeus::CQuaternion& r
return zeus::CTransform(invRot, invRot.transform(camPos - pos) + pos);
}
void CSamusHud::SetMessage(const std::u16string& text, const CHUDMemoParms& info)
void CSamusHud::SetMessage(std::u16string_view text, const CHUDMemoParms& info)
{
bool isWidgetVisible = x598_base_basewidget_message->GetIsVisible();
if (!isWidgetVisible || info.x6_hintMemo)
@@ -1799,7 +1799,7 @@ void CSamusHud::SetMessage(const std::u16string& text, const CHUDMemoParms& info
}
else
{
x59c_base_textpane_message->TextSupport().AddText(std::u16string(u"\n") + text);
x59c_base_textpane_message->TextSupport().AddText(std::u16string(u"\n") + text.data());
}
x59c_base_textpane_message->SetColor(zeus::CColor::skWhite);

6
Runtime/MP1/CSamusHud.hpp
View File

@@ -267,16 +267,16 @@ public:
static zeus::CTransform BuildFinalCameraTransform(const zeus::CQuaternion& rot,
const zeus::CVector3f& pos,
const zeus::CVector3f& camPos);
static void DisplayHudMemo(const std::u16string& text, const CHUDMemoParms& info)
static void DisplayHudMemo(std::u16string_view text, const CHUDMemoParms& info)
{
if (g_SamusHud)
g_SamusHud->InternalDisplayHudMemo(text, info);
}
void InternalDisplayHudMemo(const std::u16string& text, const CHUDMemoParms& info)
void InternalDisplayHudMemo(std::u16string_view text, const CHUDMemoParms& info)
{
SetMessage(text, info);
}
void SetMessage(const std::u16string& text, const CHUDMemoParms& info);
void SetMessage(std::u16string_view text, const CHUDMemoParms& info);
static void DeferHintMemo(CAssetId strg, u32 strgIdx, const CHUDMemoParms& info)
{
if (g_SamusHud)

6
Runtime/MP1/CSaveGameScreenTouchBar.cpp
View File

@@ -6,9 +6,9 @@ namespace MP1
{
int CSaveGameScreenTouchBar::PopOption() { return -1; }
void CSaveGameScreenTouchBar::SetUIOpts(const std::u16string& opt0,
const std::u16string& opt1,
const std::u16string& opt2) {}
void CSaveGameScreenTouchBar::SetUIOpts(std::u16string_view opt0,
std::u16string_view opt1,
std::u16string_view opt2) {}
#ifndef __APPLE__
std::unique_ptr<CSaveGameScreenTouchBar> NewSaveUITouchBar()

6
Runtime/MP1/CSaveGameScreenTouchBar.hpp
View File

@@ -15,9 +15,9 @@ class CSaveGameScreenTouchBar
public:
virtual ~CSaveGameScreenTouchBar() = default;
virtual int PopOption();
virtual void SetUIOpts(const std::u16string& opt0,
const std::u16string& opt1,
const std::u16string& opt2);
virtual void SetUIOpts(std::u16string_view opt0,
std::u16string_view opt1,
std::u16string_view opt2);
};
std::unique_ptr<CSaveGameScreenTouchBar> NewSaveUITouchBar();

6
Runtime/MP1/CSaveGameScreenTouchBarMac.mm
View File

@@ -108,9 +108,9 @@ public:
}
return -1;
}
void SetUIOpts(const std::u16string& opt0,
const std::u16string& opt1,
const std::u16string& opt2)
void SetUIOpts(std::u16string_view opt0,
std::u16string_view opt1,
std::u16string_view opt2)
{
m_touchBar->_opts[0] = opt0.size() ? [NSString stringWithUTF8String:hecl::Char16ToUTF8(opt0).c_str()] : nil;
m_touchBar->_opts[1] = opt1.size() ? [NSString stringWithUTF8String:hecl::Char16ToUTF8(opt1).c_str()] : nil;

6
Runtime/MP1/CSlideShow.cpp
View File

@@ -13,7 +13,7 @@ CSlideShow::CSlideShow()
x134_30_ = true;
x135_24_ = true;
const SObjectTag* font = g_ResFactory->GetResourceIdByName(g_tweakSlideShow->GetFont().c_str());
const SObjectTag* font = g_ResFactory->GetResourceIdByName(g_tweakSlideShow->GetFont());
if (font)
{
CGuiTextProperties propsA(false, true, EJustification::Center, EVerticalJustification::Bottom);
@@ -66,9 +66,9 @@ CSlideShow::CSlideShow()
}
}
bool CSlideShow::LoadTXTRDep(const std::string& name)
bool CSlideShow::LoadTXTRDep(std::string_view name)
{
const SObjectTag* dgrpTag = g_ResFactory->GetResourceIdByName(name.c_str());
const SObjectTag* dgrpTag = g_ResFactory->GetResourceIdByName(name);
if (dgrpTag && dgrpTag->type == FOURCC('DGRP'))
{
x18_galleryTXTRDeps.push_back(g_SimplePool->GetObj(*dgrpTag));

2
Runtime/MP1/CSlideShow.hpp
View File

@@ -110,7 +110,7 @@ private:
u32 dummy = 0;
};
bool LoadTXTRDep(const std::string& name);
bool LoadTXTRDep(std::string_view name);
static bool AreAllDepsLoaded(const std::vector<TLockedToken<CDependencyGroup>>& deps);
public:

6
Runtime/MP1/MP1.cpp
View File

@@ -212,7 +212,7 @@ void CGameArchitectureSupport::UnloadAudio()
{
const AudioGroupInfo& info = StaticAudioGroups[i];
const SObjectTag* tag = g_ResFactory->GetResourceIdByName(info.name);
const std::string& name = CAudioSys::SysGetGroupSetName(tag->id);
auto name = CAudioSys::SysGetGroupSetName(tag->id);
CAudioSys::SysRemoveGroupFromAmuse(name);
CAudioSys::SysUnloadAudioGroupSet(name);
}
@@ -338,10 +338,10 @@ void CMain::AddWorldPaks()
CResLoader* loader = g_ResFactory->GetResLoader();
if (!loader)
return;
auto& pakPrefix = g_tweakGame->GetWorldPrefix();
auto pakPrefix = g_tweakGame->GetWorldPrefix();
for (int i=0 ; i<9 ; ++i)
{
std::string path = pakPrefix;
std::string path(pakPrefix);
if (i != 0)
path += '0' + i;
if (CDvdFile::FileExists((path + ".upak").c_str()))

4
Runtime/MP1/World/CActorContraption.cpp
View File

@@ -10,7 +10,7 @@
namespace urde
{
MP1::CActorContraption::CActorContraption(TUniqueId uid, const std::string& name, const CEntityInfo& info,
MP1::CActorContraption::CActorContraption(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const zeus::CAABox& aabox,
const CMaterialList& matList, float mass, float zMomentum, const CHealthInfo& hInfo,
const CDamageVulnerability& dVuln, const CActorParameters& aParams,
@@ -79,7 +79,7 @@ void MP1::CActorContraption::DoUserAnimEvent(CStateManager& mgr, CInt32POINode&
CActor::DoUserAnimEvent(mgr, node, evType, dt);
}
CFlameThrower* MP1::CActorContraption::CreateFlameThrower(const std::string& name, CStateManager& mgr)
CFlameThrower* MP1::CActorContraption::CreateFlameThrower(std::string_view name, CStateManager& mgr)
{
const auto& it = std::find_if(x2e8_children.begin(), x2e8_children.end(),
[&name](const std::pair<TUniqueId, std::string>& p) { return p.second == name; });

4
Runtime/MP1/World/CActorContraption.hpp
View File

@@ -17,7 +17,7 @@ class CActorContraption : public CScriptActor
CAssetId x308_flameFxId;
CDamageInfo x30c_dInfo;
public:
CActorContraption(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
CActorContraption(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const zeus::CAABox&, const CMaterialList&, float, float, const CHealthInfo&,
const CDamageVulnerability&, const CActorParameters&, CAssetId, const CDamageInfo&, bool);
@@ -25,7 +25,7 @@ public:
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager &);
void Think(float, CStateManager &);
void DoUserAnimEvent(CStateManager &, CInt32POINode &, EUserEventType, float dt);
CFlameThrower* CreateFlameThrower(const std::string&, CStateManager&);
CFlameThrower* CreateFlameThrower(std::string_view, CStateManager&);
void ResetFlameThrowers(CStateManager& mgr);
};
}

2
Runtime/MP1/World/CBeetle.cpp
View File

@@ -8,7 +8,7 @@ namespace urde
namespace MP1
{
CBeetle::CBeetle(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData,
CBeetle::CBeetle(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData,
const CPatternedInfo& pInfo, CPatterned::EFlavorType flavor, CBeetle::EEntranceType, const CDamageInfo&,
const CDamageVulnerability&, const zeus::CVector3f&, float, float, float, const CDamageVulnerability&,
const CActorParameters& aParams, const rstl::optional_object<CStaticRes>)

2
Runtime/MP1/World/CBeetle.hpp
View File

@@ -19,7 +19,7 @@ public:
};
private:
public:
CBeetle(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
CBeetle(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const CPatternedInfo&, CPatterned::EFlavorType,EEntranceType, const CDamageInfo &, const CDamageVulnerability&,
const zeus::CVector3f&, float, float, float, const CDamageVulnerability&, const CActorParameters&,
const rstl::optional_object<CStaticRes>);

2
Runtime/MP1/World/CMetaree.cpp
View File

@@ -8,7 +8,7 @@ namespace urde
{
namespace MP1
{
CMetaree::CMetaree(TUniqueId uid, const std::string& name, EFlavorType flavor, const CEntityInfo& info,
CMetaree::CMetaree(TUniqueId uid, std::string_view name, EFlavorType flavor, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo, const CDamageInfo& dInfo,
float f1, const zeus::CVector3f& v1, float f2, EBodyType bodyType, float f3, float f4,
const CActorParameters& aParms)

2
Runtime/MP1/World/CMetaree.hpp
View File

@@ -38,7 +38,7 @@ class CMetaree : public CPatterned
u32 x5cc_;
public:
static constexpr ECharacter CharacterType = ECharacter::Metaree;
CMetaree(TUniqueId, const std::string&, EFlavorType, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
CMetaree(TUniqueId, std::string_view, EFlavorType, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const CPatternedInfo&, const CDamageInfo&, float, const zeus::CVector3f&, float, EBodyType, float, float,
const CActorParameters&);

2
Runtime/MP1/World/CMetroid.cpp
View File

@@ -22,7 +22,7 @@ CMetroidData::CMetroidData(CInputStream& in)
x128_24_ = in.readBool();
}
CMetroid::CMetroid(TUniqueId uid, const std::string& name, EFlavorType flavor, const CEntityInfo& info,
CMetroid::CMetroid(TUniqueId uid, std::string_view name, EFlavorType flavor, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
const CActorParameters& aParms, const CMetroidData& metroidData)
: CPatterned(ECharacter::Metroid, uid, name, flavor, info, xf, std::move(mData), pInfo,

2
Runtime/MP1/World/CMetroid.hpp
View File

@@ -32,7 +32,7 @@ class CMetroid : public CPatterned
{
public:
static constexpr ECharacter CharacterType = ECharacter::Metroid;
CMetroid(TUniqueId uid, const std::string& name, EFlavorType flavor, const CEntityInfo& info,
CMetroid(TUniqueId uid, std::string_view name, EFlavorType flavor, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
const CActorParameters& aParms, const CMetroidData& metroidData);
};

2
Runtime/MP1/World/CMetroidBeta.cpp
View File

@@ -6,7 +6,7 @@ namespace urde
namespace MP1
{
CMetroidBeta::CMetroidBeta(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CMetroidBeta::CMetroidBeta(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
const CActorParameters& aParms, const CMetroidData& metroidData)
: CPatterned(ECharacter::MetroidBeta, uid, name, EFlavorType::One, info, xf, std::move(mData), pInfo,

2
Runtime/MP1/World/CMetroidBeta.hpp
View File

@@ -13,7 +13,7 @@ class CMetroidBeta : public CPatterned
{
public:
static constexpr ECharacter CharacterType = ECharacter::MetroidBeta;
CMetroidBeta(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CMetroidBeta(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
const CActorParameters& aParms, const CMetroidData& metroidData);
void RenderHitGunEffect() const;

2
Runtime/MP1/World/CMetroidPrimeExo.cpp
View File

@@ -146,7 +146,7 @@ SPrimeExoRoomParameters::SPrimeExoRoomParameters(CInputStream& in)
x0_.push_back(in.readFloatBig());
}
CMetroidPrimeExo::CMetroidPrimeExo(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CMetroidPrimeExo::CMetroidPrimeExo(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
const CActorParameters& aParms, u32 pw1, const CCameraShakeData& shakeData1,
const CCameraShakeData& shakeData2, const CCameraShakeData& shakeData3,

2
Runtime/MP1/World/CMetroidPrimeExo.hpp
View File

@@ -119,7 +119,7 @@ class CMetroidPrimeExo : public CPatterned
{
public:
static constexpr ECharacter CharacterType = ECharacter::MetroidPrimeExo;
CMetroidPrimeExo(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CMetroidPrimeExo(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CPatternedInfo& pInfo, const CActorParameters& aParms,
u32 pw1, const CCameraShakeData& shakeData1, const CCameraShakeData& shakeData2,
const CCameraShakeData& shakeData3, const SPrimeStruct2B& struct2b, CAssetId particle1,

2
Runtime/MP1/World/CMetroidPrimeRelay.cpp
View File

@@ -6,7 +6,7 @@ namespace urde
namespace MP1
{
CMetroidPrimeRelay::CMetroidPrimeRelay(TUniqueId uid, const std::string& name, const CEntityInfo& info, bool active,
CMetroidPrimeRelay::CMetroidPrimeRelay(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active,
const zeus::CTransform& xf, const zeus::CVector3f& scale,
SPrimeExoParameters&& parms, float f1, float f2, float f3, u32 w1,
bool b1, u32 w2, const CHealthInfo& hInfo1, const CHealthInfo& hInfo2, u32 w3,

2
Runtime/MP1/World/CMetroidPrimeRelay.hpp
View File

@@ -29,7 +29,7 @@ class CMetroidPrimeRelay : public CEntity
rstl::reserved_vector<SPrimeExoRoomParameters, 4> xcb8_roomParms;
public:
CMetroidPrimeRelay(TUniqueId uid, const std::string& name, const CEntityInfo& info, bool active,
CMetroidPrimeRelay(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active,
const zeus::CTransform& xf, const zeus::CVector3f& scale, SPrimeExoParameters&& parms,
float f1, float f2, float f3, u32 w1, bool b1, u32 w2, const CHealthInfo& hInfo1,
const CHealthInfo& hInfo2, u32 w3, u32 w4, u32 w5,

2
Runtime/MP1/World/CNewIntroBoss.cpp
View File

@@ -7,7 +7,7 @@ namespace urde
namespace MP1
{
CNewIntroBoss::CNewIntroBoss(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CNewIntroBoss::CNewIntroBoss(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
const CActorParameters& actParms, float, u32, const CDamageInfo& dInfo,
u32, u32, u32, u32)

2
Runtime/MP1/World/CNewIntroBoss.hpp
View File

@@ -13,7 +13,7 @@ namespace MP1
class CNewIntroBoss : public CPatterned
{
public:
CNewIntroBoss(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CNewIntroBoss(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
const CActorParameters& actParms, float, u32, const CDamageInfo& dInfo,
u32, u32, u32, u32);

2
Runtime/MP1/World/CSpacePirate.cpp
View File

@@ -6,7 +6,7 @@ namespace urde
{
namespace MP1
{
CSpacePirate::CSpacePirate(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CSpacePirate::CSpacePirate(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CActorParameters& aParams, const CPatternedInfo& pInfo, CInputStream& in,
u32 propCount)
: CPatterned(ECharacter::SpacePirate, uid, name, EFlavorType::Zero, info, xf, std::move(mData), pInfo, EMovementType::Ground,

2
Runtime/MP1/World/CSpacePirate.hpp
View File

@@ -10,7 +10,7 @@ namespace MP1
class CSpacePirate : public CPatterned
{
public:
CSpacePirate(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
CSpacePirate(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const CActorParameters&, const CPatternedInfo&, CInputStream&, u32);
void Accept(IVisitor &visitor);

2
Runtime/MP1/World/CThardusRockProjectile.cpp
View File

@@ -4,7 +4,7 @@ namespace urde
{
CThardusRockProjectile::CThardusRockProjectile(
TUniqueId uid, const std::string& name, const CEntityInfo& info,
TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& modelData, const CActorParameters& aParms,
const CPatternedInfo& patternedInfo, const std::vector<CModelData>& mDataVec, u32)
: CPatterned(ECharacter::ThardusRockProjectile, uid, name, EFlavorType::Zero, info, xf, std::move(modelData),

2
Runtime/MP1/World/CThardusRockProjectile.hpp
View File

@@ -10,7 +10,7 @@ class CThardusRockProjectile : public CPatterned
{
public:
static constexpr ECharacter CharacterType = ECharacter::ThardusRockProjectile;
CThardusRockProjectile(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CThardusRockProjectile(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& modelData, const CActorParameters& aParms,
const CPatternedInfo& patternedInfo, const std::vector<CModelData>& mDataVec, u32);
};

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

@@ -6,7 +6,7 @@ namespace urde
{
namespace MP1
{
CWarWasp::CWarWasp(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CWarWasp::CWarWasp(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CPatternedInfo& pInfo, CPatterned::EFlavorType flavor,
CPatterned::EColliderType collider, const CDamageInfo& dInfo1, const CActorParameters& actorParms,
CAssetId weapon, const CDamageInfo& dInfo2, CAssetId particle, u32 w3)

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

@@ -11,10 +11,10 @@ namespace MP1
class CWarWasp : public CPatterned
{
public:
CWarWasp(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CWarWasp(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
CPatterned::EFlavorType flavor, CPatterned::EColliderType, const CDamageInfo& dInfo1, const CActorParameters&,
CAssetId weapon, const CDamageInfo& dInfo2, CAssetId particle, u32 w3);
CPatterned::EFlavorType flavor, CPatterned::EColliderType, const CDamageInfo& dInfo1,
const CActorParameters&, CAssetId weapon, const CDamageInfo& dInfo2, CAssetId particle, u32 w3);
void Accept(IVisitor &visitor);
};