mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Proposal) Adjustments to "decomp" language (#308)

Browse Source 
* Adjustments to "decomp" language

* Fix a comment

* Fix accidental clang-formatting

* Fix order

* Fix order

* Remove junk

* Fix OFFSET

* Adjustments based on new suggestions

* Annotate globals

* Globals in ISLE

* More globals

* Merge from parser2 branch

* Allow prepending space for exact marker match

* To eliminate noise, require the 0x prefix on offset for marker match

* fix test from previous

* Count tab stops for indented functions to reduce MISSED_END_OF_FUNCTION noise

* FUNCTION to SYNTHETIC where needed

* Missed marker conversion on SetAtomId

* pylint cleanup, remove unused code

* Fix unexpected function end, add more unit tests

* Be more strict about synthetic name syntax

* Revert "Missed marker conversion on SetAtomId"

This reverts commit d87d665127.

* Revert "FUNCTION to SYNTHETIC where needed"

This reverts commit 8c815418d2.

* Implicit lookup by name for functions

* Fix VTABLE SYNTHETIC and other decomp markers

* Get vtable class name

* Vtable marker should identify struct

* No colon for SIZE comment

* Update README.md

* Update README.md

* Update CONTRIBUTING.md

* Update README.md

* Update README.md

* Update CONTRIBUTING.md

* Update README.md

* Update CONTRIBUTING.md

* Fix destructor/annotation

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

---------

Co-authored-by: disinvite <disinvite@users.noreply.github.com>
This commit is contained in:
Christian Semmler
2023-12-06 07:10:45 -05:00
committed by GitHub
parent 4f5b70013f
commit 494a556f8e
407 changed files with 3505 additions and 2493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
LEGO1/mxdsmultiaction.cpp
View File

@@ -2,7 +2,7 @@
DECOMP_SIZE_ASSERT(MxDSMultiAction, 0x9c)
// OFFSET: LEGO1 0x100c9b90
// FUNCTION: LEGO1 0x100c9b90
MxDSMultiAction::MxDSMultiAction()
{
this->SetType(MxDSType_MultiAction);
@@ -10,14 +10,14 @@ MxDSMultiAction::MxDSMultiAction()
this->m_actions->SetDestroy(MxDSActionList::Destroy);
}
// OFFSET: LEGO1 0x100ca060
// FUNCTION: LEGO1 0x100ca060
MxDSMultiAction::~MxDSMultiAction()
{
if (this->m_actions)
delete this->m_actions;
}
// OFFSET: LEGO1 0x100ca0d0
// FUNCTION: LEGO1 0x100ca0d0
void MxDSMultiAction::CopyFrom(MxDSMultiAction& p_dsMultiAction)
{
this->m_actions->DeleteAll();
@@ -28,7 +28,7 @@ void MxDSMultiAction::CopyFrom(MxDSMultiAction& p_dsMultiAction)
this->m_actions->Append(action->Clone());
}
// OFFSET: LEGO1 0x100ca260
// FUNCTION: LEGO1 0x100ca260
MxDSMultiAction& MxDSMultiAction::operator=(MxDSMultiAction& p_dsMultiAction)
{
if (this == &p_dsMultiAction)
@@ -39,7 +39,7 @@ MxDSMultiAction& MxDSMultiAction::operator=(MxDSMultiAction& p_dsMultiAction)
return *this;
}
// OFFSET: LEGO1 0x100ca290
// FUNCTION: LEGO1 0x100ca290
void MxDSMultiAction::SetUnkTimingField(MxLong p_unkTimingField)
{
this->m_unkTimingField = p_unkTimingField;
@@ -50,7 +50,7 @@ void MxDSMultiAction::SetUnkTimingField(MxLong p_unkTimingField)
action->SetUnkTimingField(p_unkTimingField);
}
// OFFSET: LEGO1 0x100ca370
// FUNCTION: LEGO1 0x100ca370
void MxDSMultiAction::MergeFrom(MxDSAction& p_dsMultiAction)
{
MxDSAction::MergeFrom(p_dsMultiAction);
@@ -61,7 +61,7 @@ void MxDSMultiAction::MergeFrom(MxDSAction& p_dsMultiAction)
action->MergeFrom(p_dsMultiAction);
}
// OFFSET: LEGO1 0x100ca450
// FUNCTION: LEGO1 0x100ca450
MxBool MxDSMultiAction::HasId(MxU32 p_objectId)
{
if (this->GetObjectId() == p_objectId)
@@ -77,7 +77,7 @@ MxBool MxDSMultiAction::HasId(MxU32 p_objectId)
return FALSE;
}
// OFFSET: LEGO1 0x100ca550
// FUNCTION: LEGO1 0x100ca550
MxDSAction* MxDSMultiAction::Clone()
{
MxDSMultiAction* clone = new MxDSMultiAction();
@@ -88,7 +88,7 @@ MxDSAction* MxDSMultiAction::Clone()
return clone;
}
// OFFSET: LEGO1 0x100ca5e0
// FUNCTION: LEGO1 0x100ca5e0
undefined4 MxDSMultiAction::unk14()
{
undefined4 result = MxDSAction::unk14();
@@ -101,7 +101,7 @@ undefined4 MxDSMultiAction::unk14()
return result;
}
// OFFSET: LEGO1 0x100ca6c0
// FUNCTION: LEGO1 0x100ca6c0
MxU32 MxDSMultiAction::GetSizeOnDisk()
{
MxU32 totalSizeOnDisk = MxDSAction::GetSizeOnDisk() + 16;
@@ -116,7 +116,7 @@ MxU32 MxDSMultiAction::GetSizeOnDisk()
return totalSizeOnDisk;
}
// OFFSET: LEGO1 0x100ca7b0
// FUNCTION: LEGO1 0x100ca7b0
void MxDSMultiAction::Deserialize(char** p_source, MxS16 p_unk24)
{
MxDSAction::Deserialize(p_source, p_unk24);
@@ -142,7 +142,7 @@ void MxDSMultiAction::Deserialize(char** p_source, MxS16 p_unk24)
*p_source += extraFlag;
}
// OFFSET: LEGO1 0x100ca8c0
// FUNCTION: LEGO1 0x100ca8c0
void MxDSMultiAction::SetAtomId(MxAtomId p_atomId)
{
MxDSAction::SetAtomId(p_atomId);