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

Rename MxDSSubscriber functions (#573)

Browse Source
This commit is contained in:
Christian Semmler
2024-02-17 10:35:10 -05:00
committed by GitHub
parent 332d8da695
commit 1d189b013d
17 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
View File

@@ -49,7 +49,7 @@ void LegoLoadCacheSoundPresenter::ReadyTickle()
m_cacheSound = new LegoCacheSound;
memcpy(&m_pcmWaveFormat, &header->m_pcmWaveFormat, sizeof(m_pcmWaveFormat));
m_subscriber->DestroyChunk(chunk);
m_subscriber->FreeDataChunk(chunk);
ProgressTickleState(e_streaming);
}
}

2
LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
View File

@@ -21,7 +21,7 @@ void LegoActionControlPresenter::ReadyTickle()
ParseExtra();
ProgressTickleState(e_starting);
m_subscriber->DestroyChunk(chunk);
m_subscriber->FreeDataChunk(chunk);
if (m_compositePresenter) {
if (m_action->GetDuration() == -1 || m_action->GetFlags() & 1) {
m_compositePresenter->VTable0x60(this);

4
LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
View File

@@ -69,14 +69,14 @@ void LegoPathPresenter::ReadyTickle()
// FUNCTION: LEGO1 0x10044d00
void LegoPathPresenter::StreamingTickle()
{
MxStreamChunk* chunk = m_subscriber->NextChunk();
MxStreamChunk* chunk = m_subscriber->PopData();
if (chunk) {
if (chunk->GetFlags() & MxStreamChunk::c_end) {
ProgressTickleState(e_repeating);
}
m_subscriber->DestroyChunk(chunk);
m_subscriber->FreeDataChunk(chunk);
}
}

12
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View File

@@ -105,12 +105,12 @@ void LegoAnimPresenter::ReadyTickle()
m_currentWorld = CurrentWorld();
if (m_currentWorld) {
MxStreamChunk* chunk = m_subscriber->CurrentChunk();
MxStreamChunk* chunk = m_subscriber->PeekData();
if (chunk && chunk->GetTime() + m_action->GetStartTime() <= m_action->GetElapsedTime()) {
chunk = m_subscriber->NextChunk();
chunk = m_subscriber->PopData();
MxResult result = VTable0x88(chunk);
m_subscriber->DestroyChunk(chunk);
m_subscriber->FreeDataChunk(chunk);
if (result == SUCCESS) {
ProgressTickleState(e_starting);
@@ -134,9 +134,9 @@ void LegoAnimPresenter::StartingTickle()
// FUNCTION: LEGO1 0x1006b840
void LegoAnimPresenter::StreamingTickle()
{
if (m_subscriber->CurrentChunk()) {
MxStreamChunk* chunk = m_subscriber->NextChunk();
m_subscriber->DestroyChunk(chunk);
if (m_subscriber->PeekData()) {
MxStreamChunk* chunk = m_subscriber->PopData();
m_subscriber->FreeDataChunk(chunk);
}
if (m_unk0x95) {

8
LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
View File

@@ -80,12 +80,12 @@ void LegoModelPresenter::ReadyTickle()
EndAction();
}
else {
MxStreamChunk* chunk = m_subscriber->CurrentChunk();
MxStreamChunk* chunk = m_subscriber->PeekData();
if (chunk != NULL && chunk->GetTime() <= m_action->GetElapsedTime()) {
chunk = m_subscriber->NextChunk();
chunk = m_subscriber->PopData();
MxResult result = CreateROI(chunk);
m_subscriber->DestroyChunk(chunk);
m_subscriber->FreeDataChunk(chunk);
if (result == SUCCESS) {
VideoManager()->Get3DManager()->GetLego3DView()->Add(*m_roi);
@@ -135,7 +135,7 @@ void LegoModelPresenter::ParseExtra()
list<LegoROI*>& roiList = currentWorld->GetUnknownList0xe0();
for (list<LegoROI*>::iterator it = roiList.begin(); it != roiList.end(); it++) {
if (!strcmpi(((LegoROI*) (*it))->GetName(), output)) {
if (!strcmpi((*it)->GetName(), output)) {
m_roi = *it;
roiList.erase(it);

6
LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
View File

@@ -73,15 +73,15 @@ MxResult LegoPalettePresenter::ParsePalette(MxStreamChunk* p_chunk)
// FUNCTION: LEGO1 0x1007a230
void LegoPalettePresenter::ReadyTickle()
{
MxStreamChunk* chunk = m_subscriber->CurrentChunk();
MxStreamChunk* chunk = m_subscriber->PeekData();
if (chunk) {
if (chunk->GetTime() <= m_action->GetElapsedTime()) {
ParseExtra();
ProgressTickleState(e_starting);
chunk = m_subscriber->NextChunk();
chunk = m_subscriber->PopData();
MxResult result = ParsePalette(chunk);
m_subscriber->DestroyChunk(chunk);
m_subscriber->FreeDataChunk(chunk);
if (result == SUCCESS) {
VideoManager()->RealizePalette(m_palette);