mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 16:34:06 +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

26
LEGO1/mxmusicmanager.cpp
View File

@@ -7,26 +7,26 @@
DECOMP_SIZE_ASSERT(MxMusicManager, 0x58);
// OFFSET: LEGO1 0x100c05a0
// FUNCTION: LEGO1 0x100c05a0
MxMusicManager::MxMusicManager()
{
Init();
}
// OFFSET: LEGO1 0x100c0630
// FUNCTION: LEGO1 0x100c0630
MxMusicManager::~MxMusicManager()
{
Destroy(TRUE);
}
// OFFSET: LEGO1 0x100c0690
// FUNCTION: LEGO1 0x100c0690
void MxMusicManager::Init()
{
m_multiplier = 100;
InitData();
}
// OFFSET: LEGO1 0x100c06a0
// FUNCTION: LEGO1 0x100c06a0
void MxMusicManager::InitData()
{
m_MIDIStreamH = 0;
@@ -39,7 +39,7 @@ void MxMusicManager::InitData()
m_MIDIHdrP = NULL;
}
// OFFSET: LEGO1 0x100c06c0
// FUNCTION: LEGO1 0x100c06c0
void MxMusicManager::Destroy(MxBool p_fromDestructor)
{
if (m_thread) {
@@ -62,7 +62,7 @@ void MxMusicManager::Destroy(MxBool p_fromDestructor)
}
}
// OFFSET: LEGO1 0x100c07f0
// FUNCTION: LEGO1 0x100c07f0
void MxMusicManager::SetMIDIVolume()
{
MxS32 result = (m_volume * m_multiplier) / 0x64;
@@ -74,7 +74,7 @@ void MxMusicManager::SetMIDIVolume()
}
}
// OFFSET: LEGO1 0x100c0840
// FUNCTION: LEGO1 0x100c0840
MxResult MxMusicManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
{
MxResult status = FAILURE;
@@ -105,13 +105,13 @@ done:
return status;
}
// OFFSET: LEGO1 0x100c0930
// FUNCTION: LEGO1 0x100c0930
void MxMusicManager::Destroy()
{
Destroy(FALSE);
}
// OFFSET: LEGO1 0x100c0940
// FUNCTION: LEGO1 0x100c0940
void MxMusicManager::SetVolume(MxS32 p_volume)
{
MxAudioManager::SetVolume(p_volume);
@@ -120,7 +120,7 @@ void MxMusicManager::SetVolume(MxS32 p_volume)
m_criticalSection.Leave();
}
// OFFSET: LEGO1 0x100c0970
// FUNCTION: LEGO1 0x100c0970
void MxMusicManager::SetMultiplier(MxS32 p_multiplier)
{
m_criticalSection.Enter();
@@ -129,21 +129,21 @@ void MxMusicManager::SetMultiplier(MxS32 p_multiplier)
m_criticalSection.Leave();
}
// OFFSET: LEGO1 0x100c09a0
// FUNCTION: LEGO1 0x100c09a0
MxS32 MxMusicManager::CalculateVolume(MxS32 p_volume)
{
MxS32 result = (p_volume * 0xffff) / 100;
return (result << 0x10) | result;
}
// OFFSET: LEGO1 0x100c09c0 STUB
// STUB: LEGO1 0x100c09c0
undefined4 MxMusicManager::FUN_100c09c0(MxU8* p_data, MxS32 p_loopCount)
{
// TODO
return 0;
}
// OFFSET: LEGO1 0x100c0b20
// FUNCTION: LEGO1 0x100c0b20
void MxMusicManager::DeinitializeMIDI()
{
m_criticalSection.Enter();