mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-23 00:14:22 +00:00
Name various functions and other members (#418)
* Name various functions and other members * Rename var
This commit is contained in:

committed by
GitHub

parent
79465d358d
commit
58ea45f4cc
@@ -28,7 +28,7 @@ public:
|
||||
virtual void ReadyTickle() override; // vtable+0x18
|
||||
virtual void Destroy() override; // vtable+0x38
|
||||
|
||||
MxResult ParsePallete(MxStreamChunk* p_chunk);
|
||||
MxResult ParsePalette(MxStreamChunk* p_chunk);
|
||||
|
||||
private:
|
||||
void Init();
|
||||
|
@@ -22,7 +22,7 @@ void LegoActionControlPresenter::ReadyTickle()
|
||||
m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
|
||||
m_currentTickleState = TickleState_Starting;
|
||||
|
||||
m_subscriber->FUN_100b8390(chunk);
|
||||
m_subscriber->DestroyChunk(chunk);
|
||||
if (m_compositePresenter) {
|
||||
if (m_action->GetDuration() == -1 || m_action->GetFlags() & 1) {
|
||||
m_compositePresenter->VTable0x60(this);
|
||||
|
@@ -114,7 +114,7 @@ void MxCompositeMediaPresenter::StartingTickle()
|
||||
}
|
||||
else {
|
||||
for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
|
||||
if (!(*it)->GetAction()->GetStartTime() && ((MxMediaPresenter*) *it)->FUN_100b5650() &&
|
||||
if (!(*it)->GetAction()->GetStartTime() && ((MxMediaPresenter*) *it)->CurrentChunk() &&
|
||||
!((*it)->GetAction()->GetFlags() & MxDSAction::Flag_Bit9)) {
|
||||
(*it)->Tickle();
|
||||
(*it)->GetAction()->SetFlags((*it)->GetAction()->GetFlags() | MxDSAction::Flag_Bit9);
|
||||
|
@@ -46,7 +46,7 @@ void LegoPalettePresenter::Destroy()
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x1007a130
|
||||
MxResult LegoPalettePresenter::ParsePallete(MxStreamChunk* p_chunk)
|
||||
MxResult LegoPalettePresenter::ParsePalette(MxStreamChunk* p_chunk)
|
||||
{
|
||||
MxU8 buffer[40];
|
||||
RGBQUAD palleteData[256];
|
||||
@@ -72,15 +72,15 @@ MxResult LegoPalettePresenter::ParsePallete(MxStreamChunk* p_chunk)
|
||||
// FUNCTION: LEGO1 0x1007a230
|
||||
void LegoPalettePresenter::ReadyTickle()
|
||||
{
|
||||
MxStreamChunk* chunk = m_subscriber->FUN_100b8360();
|
||||
MxStreamChunk* chunk = m_subscriber->CurrentChunk();
|
||||
if (chunk) {
|
||||
if (chunk->GetTime() <= m_action->GetElapsedTime()) {
|
||||
ParseExtra();
|
||||
m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
|
||||
m_currentTickleState = TickleState_Starting;
|
||||
chunk = m_subscriber->FUN_100b8250();
|
||||
MxResult result = ParsePallete(chunk);
|
||||
m_subscriber->FUN_100b8390(chunk);
|
||||
chunk = m_subscriber->NextChunk();
|
||||
MxResult result = ParsePalette(chunk);
|
||||
m_subscriber->DestroyChunk(chunk);
|
||||
|
||||
if (result == SUCCESS) {
|
||||
VideoManager()->RealizePalette(m_palette);
|
||||
|
Reference in New Issue
Block a user