AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-21 03:39:11 +00:00
Code Issues Projects Releases Wiki Activity

Rename everything

Browse Source
This commit is contained in:
Phillip Stephens
2021-04-10 01:42:06 -07:00
parent 05d8ab688e
commit 9bae2f943e
1198 changed files with 2884 additions and 2883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/MP1/World/CThardus.cpp
View File

@@ -26,7 +26,7 @@
#include <DataSpec/DNAMP1/SFX/IceWorld.h>
#include <DataSpec/DNAMP1/SFX/Thardus.h>
namespace urde::MP1 {
namespace metaforce::MP1 {
namespace {
constexpr std::array<SSphereJointInfo, 7> skDamageableSphereJointInfoList1{{
{"R_knee", 1.f},
@@ -1181,7 +1181,7 @@ bool CThardus::ShouldTurn(CStateManager& mgr, float arg) {
}
bool CThardus::HitSomething(CStateManager& mgr, float arg) { return mgr.GetPlayer().GetFrozenState(); }
void CThardus::GatherWaypoints(urde::CScriptWaypoint* wp, urde::CStateManager& mgr,
void CThardus::GatherWaypoints(metaforce::CScriptWaypoint* wp, metaforce::CStateManager& mgr,
rstl::reserved_vector<TUniqueId, 16>& uids) {
if (uids.size() < uids.capacity() && wp->GetActive()) {
uids.push_back(wp->GetUniqueId());
@@ -1349,7 +1349,7 @@ void CThardus::sub801dbbdc(CStateManager& mgr, CDestroyableRock* rock) {
}
void CThardus::UpdateNonDestroyableCollisionActorMaterials(EUpdateMaterialMode mode, EMaterialTypes mat,
urde::CStateManager& mgr) {
metaforce::CStateManager& mgr) {
for (const auto& uid : x634_nonDestroyableActors) {
if (TCastToPtr<CCollisionActor> col = mgr.ObjectById(uid)) {
if (mode == EUpdateMaterialMode::Remove) {
@@ -1594,4 +1594,4 @@ zeus::CVector2f CThardus::sub801dc60c(float arg, CStateManager& mgr) {
return ret;
}
} // namespace urde::MP1
} // namespace metaforce::MP1