AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-18 12:05:24 +00:00
Code Issues Projects Releases Wiki Activity

CDrone: AcceptScriptMsg fixes

Browse Source
This commit is contained in:
Luke Street
2020-09-06 18:12:15 -04:00
parent 8cb20650fa
commit f93400c8c2
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,7 +218,7 @@ void CDrone::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateM
}
case EScriptObjectMessage::Deactivate:
case EScriptObjectMessage::Deleted: {
for (TUniqueId& unkId : x7d4_) {
for (TUniqueId& unkId : x7d8_) {
if (unkId != kInvalidUniqueId) {
mgr.FreeScriptObject(unkId);
unkId = kInvalidUniqueId;
@@ -228,9 +228,11 @@ void CDrone::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateM
mgr.GetPlayerState()->GetStaticInterference().RemoveSource(GetUniqueId());
if (x578_lightId != kInvalidUniqueId) {
mgr.FreeScriptObject(x578_lightId);
x578_lightId = kInvalidUniqueId;
}
if (x57a_ != kInvalidUniqueId) {
mgr.FreeScriptObject(x57a_);
x57a_ = kInvalidUniqueId;
}
if (x7d0_) {
@@ -243,7 +245,7 @@ void CDrone::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateM
x834_29_codeTrigger = true;
break;
case EScriptObjectMessage::OnFloor:
if (!x835_26_ && x834_24_) {
if (!x835_26_ && x834_24_ && !IsAlive()) {
x835_26_ = true;
MassiveFrozenDeath(mgr);
}
@@ -822,10 +824,12 @@ void CDrone::SetLightEnabled(CStateManager& mgr, bool activate) {
activate ? EScriptObjectMessage::Activate : EScriptObjectMessage::Deactivate);
}
void CDrone::SetVisorFlareEnabled(CStateManager& mgr, bool activate) {}
void CDrone::SetVisorFlareEnabled(CStateManager& mgr, bool activate) {
// TODO implement
}
void CDrone::UpdateVisorFlare(CStateManager& mgr) {
// TODO: Finish
// TODO implement
}
void CDrone::UpdateTouchBounds(float radius) {