PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add CScriptDockAreaChange 

Former-commit-id: 7b1fc72739
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-16 03:03:19 +03:00
parent af9f796433
commit 0019a1bd46
7 changed files with 105 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/MetroidPrime/ScriptObjects/CScriptDock.s
View File

@ -239,8 +239,8 @@ lbl_800C3884:
/* 800C3890 000C07F0 38 21 00 40 */ addi r1, r1, 0x40
/* 800C3894 000C07F4 4E 80 00 20 */ blr
.global SetDockReference__11CScriptDockFi
SetDockReference__11CScriptDockFi:
.global SetDockReference__11CScriptDockFR13CStateManageri
SetDockReference__11CScriptDockFR13CStateManageri:
/* 800C3898 000C07F8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 800C389C 000C07FC 7C 08 02 A6 */ mflr r0
/* 800C38A0 000C0800 90 01 00 24 */ stw r0, 0x24(r1)

14
asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s
View File

@ -3,8 +3,8 @@
.section .data
.balign 8
.global lbl_803E2B48
lbl_803E2B48:
.global __vt__21CScriptDockAreaChange
__vt__21CScriptDockAreaChange:
# ROM: 0x3DFB48
.4byte 0
.4byte 0
@ -27,9 +27,9 @@ __dt__21CScriptDockAreaChangeFv:
/* 8014EF68 0014BEC8 93 C1 00 08 */ stw r30, 8(r1)
/* 8014EF6C 0014BECC 7C 7E 1B 79 */ or. r30, r3, r3
/* 8014EF70 0014BED0 41 82 00 28 */ beq lbl_8014EF98
/* 8014EF74 0014BED4 3C A0 80 3E */ lis r5, lbl_803E2B48@ha
/* 8014EF74 0014BED4 3C A0 80 3E */ lis r5, __vt__21CScriptDockAreaChange@ha
/* 8014EF78 0014BED8 38 80 00 00 */ li r4, 0
/* 8014EF7C 0014BEDC 38 05 2B 48 */ addi r0, r5, lbl_803E2B48@l
/* 8014EF7C 0014BEDC 38 05 2B 48 */ addi r0, r5, __vt__21CScriptDockAreaChange@l
/* 8014EF80 0014BEE0 90 1E 00 00 */ stw r0, 0(r30)
/* 8014EF84 0014BEE4 4B F0 22 F1 */ bl __dt__7CEntityFv
/* 8014EF88 0014BEE8 7F E0 07 35 */ extsh. r0, r31
@ -113,7 +113,7 @@ lbl_8014F070:
/* 8014F098 0014BFF8 41 82 00 10 */ beq lbl_8014F0A8
/* 8014F09C 0014BFFC 80 BB 00 34 */ lwz r5, 0x34(r27)
/* 8014F0A0 0014C000 7F C4 F3 78 */ mr r4, r30
/* 8014F0A4 0014C004 4B F7 47 F5 */ bl SetDockReference__11CScriptDockFi
/* 8014F0A4 0014C004 4B F7 47 F5 */ bl SetDockReference__11CScriptDockFR13CStateManageri
lbl_8014F0A8:
/* 8014F0A8 0014C008 7F 43 D3 78 */ mr r3, r26
/* 8014F0AC 0014C00C 7E E4 BB 78 */ mr r4, r23
@ -175,9 +175,9 @@ lbl_8014F108:
/* 8014F168 0014C0C8 7C 87 23 78 */ mr r7, r4
/* 8014F16C 0014C0CC 38 81 00 08 */ addi r4, r1, 8
/* 8014F170 0014C0D0 4B F0 21 B5 */ bl "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
/* 8014F174 0014C0D4 3C 80 80 3E */ lis r4, lbl_803E2B48@ha
/* 8014F174 0014C0D4 3C 80 80 3E */ lis r4, __vt__21CScriptDockAreaChange@ha
/* 8014F178 0014C0D8 7F C3 F3 78 */ mr r3, r30
/* 8014F17C 0014C0DC 38 04 2B 48 */ addi r0, r4, lbl_803E2B48@l
/* 8014F17C 0014C0DC 38 04 2B 48 */ addi r0, r4, __vt__21CScriptDockAreaChange@l
/* 8014F180 0014C0E0 90 1E 00 00 */ stw r0, 0(r30)
/* 8014F184 0014C0E4 93 FE 00 34 */ stw r31, 0x34(r30)
/* 8014F188 0014C0E8 83 E1 00 1C */ lwz r31, 0x1c(r1)

11
include/MetroidPrime/ScriptObjects/CScriptDock.hpp Normal file
View File

@ -0,0 +1,11 @@
#ifndef _CSCRIPTDOCK
#define _CSCRIPTDOCK
#include "MetroidPrime/CPhysicsActor.hpp"
class CScriptDock : public CPhysicsActor {
public:
void SetDockReference(CStateManager& mgr, int);
};
#endif // _CSCRIPTDOCK

18
include/MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp Normal file
View File

@ -0,0 +1,18 @@
#ifndef _CSCRIPTDOCKAREACHANGE
#define _CSCRIPTDOCKAREACHANGE
#include "MetroidPrime/CEntity.hpp"
class CScriptDockAreaChange : public CEntity {
int x34_dockReference;
public:
CScriptDockAreaChange(TUniqueId, const rstl::string&, const CEntityInfo&, int, bool);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
~CScriptDockAreaChange();
};
#endif // _CSCRIPTDOCKAREACHANGE

10
include/MetroidPrime/ScriptObjects/CScriptRelay.hpp Normal file
View File

@ -0,0 +1,10 @@
#ifndef _CSCRIPTRELAY
#define _CSCRIPTRELAY
#include "MetroidPrime/CEntity.hpp"
class CScriptRelay : public CEntity {
public:
};
#endif // _CSCRIPTRELAY

16
include/rstl/red_black_tree.hpp
View File

@ -17,6 +17,8 @@ enum node_color {
kNC_Black,
};
void* rbtree_traverse_forward(const void*, void*);
template < typename T, typename P, int U, typename S = select1st< P >, typename Cmp = less< T >,
typename Alloc = rmemory_allocator >
class red_black_tree {
@ -42,7 +44,19 @@ public:
return mNode == other.mNode && mHeader == other.mHeader;
}
bool operator!=(const const_iterator& other) const {
return !(*this == other); // mNode != other.mNode || mHeader != other.mHeader;
// return !(*this == other);
return mNode != other.mNode || mHeader != other.mHeader;
}
const_iterator& operator++() {
mNode = static_cast<node*>(rbtree_traverse_forward(static_cast<const void*>(mHeader), static_cast<void*>(mNode)));
return *this;
}
const_iterator operator++(int) {
const_iterator result = *this;
mNode = static_cast<node*>(rbtree_traverse_forward(static_cast<const void*>(mHeader), static_cast<void*>(mNode)));
return result;
}
};

42
src/MetroidPrime/ScriptObjects/CScriptDockAreaChange.cpp Normal file
View File

@ -0,0 +1,42 @@
#include "MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp"
#include "MetroidPrime/CStateManager.hpp"
#include "MetroidPrime/ScriptObjects/CScriptDock.hpp"
CScriptDockAreaChange::CScriptDockAreaChange(TUniqueId uid, const rstl::string& name,
const CEntityInfo& info, int w1, bool active)
: CEntity(uid, info, active, name), x34_dockReference(w1) {}
void CScriptDockAreaChange::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId,
CStateManager& stateMgr) {
switch (msg) {
case kSM_Action:
if (GetActive()) {
rstl::vector< SConnection >::const_iterator it = x20_conns.begin();
for (; it != x20_conns.end(); ++it) {
if (it->x0_state != kSS_Play || it->x4_msg == kSM_UNKM0) {
continue;
}
const CStateManager::TIdListResult& search = stateMgr.GetIdListForScript(it->x8_objId);
CStateManager::TIdList::const_iterator searchItem = search.first;
for (; searchItem != search.second; ++searchItem) {
if (CScriptDock* dock =
TCastToPtr< CScriptDock >(stateMgr.ObjectById(searchItem->second))) {
dock->SetDockReference(stateMgr, x34_dockReference);
}
}
}
SendScriptMsgs(kSS_Play, stateMgr, kSM_None);
}
}
CEntity::AcceptScriptMsg(msg, objId, stateMgr);
}
void CScriptDockAreaChange::Accept(IVisitor& visitor) { visitor.Visit(*this); }
CScriptDockAreaChange::~CScriptDockAreaChange() {}