AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-15 07:26:10 +00:00
Code Issues Projects Releases Wiki Activity

Various fixes and minor code cleanup, issue warning when attempting to load an unimplemented object

Browse Source
This commit is contained in:
Phillip Stephens
2019-01-31 12:44:05 -08:00
parent 7d29c6e25a
commit 0bb51f067c
34 changed files with 362 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/MP1/World/CAtomicBeta.cpp
View File

@@ -8,17 +8,13 @@
#include "CSimplePool.hpp"
namespace urde::MP1 {
const std::string_view CAtomicBeta::skBombLocators[3] = {
"bomb2_LCTR"sv,
"bomb3_LCTR"sv,
"bomb4_LCTR"sv
};
const std::string_view CAtomicBeta::skBombLocators[3] = {"bomb2_LCTR"sv, "bomb3_LCTR"sv, "bomb4_LCTR"sv};
CAtomicBeta::CAtomicBeta(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CActorParameters& actParms, const CPatternedInfo& pInfo,
CAssetId electricId, CAssetId weaponId, const CDamageInfo& dInfo, CAssetId particleId,
float f1, float beamRadius, float f3, const CDamageVulnerability& dVuln, float f4, float f5, float f6,
s16 sId1, s16 sId2, s16 sId3, float f7)
float f1, float beamRadius, float f3, const CDamageVulnerability& dVuln, float f4, float f5,
float f6, s16 sId1, s16 sId2, s16 sId3, float f7)
: CPatterned(ECharacter::AtomicBeta, uid, name, EFlavorType::Zero, info, xf, std::move(mData), pInfo,
EMovementType::Flyer, EColliderType::One, EBodyType::RestrictedFlyer, actParms, EKnockBackVariant::Small)
, x578_(f5)
@@ -115,7 +111,7 @@ void CAtomicBeta::Think(float dt, CStateManager& mgr) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(movementVec, x5f4_, 1.f));
float mag =
x63c_ * std::max(1.f - (mgr.GetPlayer().GetTranslation() - GetTranslation()).magSquared() / (x640_ / x640_), 0.f);
x63c_ * std::max(1.f - (mgr.GetPlayer().GetTranslation() - GetTranslation()).magSquared() / (x640_ / x640_), 0.f);
if (!zeus::close_enough(mag, 0.f))
mgr.GetPlayerState()->GetStaticInterference().AddSource(GetUniqueId(), mag, 0.5f);