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

Name various functions and other members (#418)

Browse Source 
* Name various functions and other members

* Rename var
This commit is contained in:
Christian Semmler
2024-01-08 13:07:13 -05:00
committed by GitHub
parent 79465d358d
commit 58ea45f4cc
16 changed files with 133 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/omni/src/video/mxloopingflcpresenter.cpp
View File

@@ -46,9 +46,9 @@ void MxLoopingFlcPresenter::NextFrame()
}
else {
LoadFrame(chunk);
AppendChunk(chunk);
LoopChunk(chunk);
m_unk0x68 += m_flicHeader->speed;
}
m_subscriber->FUN_100b8390(chunk);
m_subscriber->DestroyChunk(chunk);
}

16
LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
View File

@@ -57,11 +57,11 @@ void MxLoopingSmkPresenter::NextFrame()
}
else {
LoadFrame(chunk);
AppendChunk(chunk);
LoopChunk(chunk);
m_elapsedDuration += 1000 / ((MxDSMediaAction*) m_action)->GetFramesPerSecond();
}
m_subscriber->FUN_100b8390(chunk);
m_subscriber->DestroyChunk(chunk);
}
// FUNCTION: LEGO1 0x100b4a90
@@ -73,7 +73,7 @@ void MxLoopingSmkPresenter::VTable0x8c()
}
else {
MxStreamChunk* chunk;
m_cursor->Current(chunk);
m_loopingChunkCursor->Current(chunk);
LoadFrame(chunk);
m_elapsedDuration += 1000 / ((MxDSMediaAction*) m_action)->GetFramesPerSecond();
}
@@ -83,9 +83,9 @@ void MxLoopingSmkPresenter::VTable0x8c()
void MxLoopingSmkPresenter::RepeatingTickle()
{
for (MxS16 i = 0; i < m_unk0x5c; i++) {
if (!m_cursor->HasMatch()) {
if (!m_loopingChunkCursor->HasMatch()) {
MxStreamChunk* chunk;
MxStreamChunkListCursor cursor(m_chunks);
MxStreamChunkListCursor cursor(m_loopingChunks);
cursor.Last(chunk);
MxLong time = chunk->GetTime();
@@ -99,18 +99,18 @@ void MxLoopingSmkPresenter::RepeatingTickle()
while (cursor.Next(chunk))
chunk->SetTime(chunk->GetTime() + time);
m_cursor->Next();
m_loopingChunkCursor->Next();
}
MxStreamChunk* chunk;
m_cursor->Current(chunk);
m_loopingChunkCursor->Current(chunk);
if (m_action->GetElapsedTime() < chunk->GetTime())
break;
VTable0x8c();
m_cursor->Next(chunk);
m_loopingChunkCursor->Next(chunk);
if (m_currentTickleState != TickleState_Repeating)
break;

4
LEGO1/omni/src/video/mxstillpresenter.cpp
View File

@@ -63,7 +63,7 @@ void MxStillPresenter::NextFrame()
{
MxStreamChunk* chunk = NextChunk();
LoadFrame(chunk);
m_subscriber->FUN_100b8390(chunk);
m_subscriber->DestroyChunk(chunk);
}
// FUNCTION: LEGO1 0x100b9dd0
@@ -122,7 +122,7 @@ void MxStillPresenter::StartingTickle()
// FUNCTION: LEGO1 0x100b9f90
void MxStillPresenter::StreamingTickle()
{
MxStreamChunk* chunk = FUN_100b5650();
MxStreamChunk* chunk = CurrentChunk();
if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
m_chunkTime = chunk->GetTime();

10
LEGO1/omni/src/video/mxvideopresenter.cpp
View File

@@ -241,13 +241,13 @@ void MxVideoPresenter::NextFrame()
MxStreamChunk* chunk = NextChunk();
if (chunk->GetFlags() & MxDSChunk::Flag_End) {
m_subscriber->FUN_100b8390(chunk);
m_subscriber->DestroyChunk(chunk);
m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
m_currentTickleState = TickleState_Repeating;
}
else {
LoadFrame(chunk);
m_subscriber->FUN_100b8390(chunk);
m_subscriber->DestroyChunk(chunk);
}
}
@@ -458,7 +458,7 @@ void MxVideoPresenter::ReadyTickle()
if (chunk) {
LoadHeader(chunk);
m_subscriber->FUN_100b8390(chunk);
m_subscriber->DestroyChunk(chunk);
ParseExtra();
m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
m_currentTickleState = TickleState_Starting;
@@ -468,7 +468,7 @@ void MxVideoPresenter::ReadyTickle()
// FUNCTION: LEGO1 0x100b2fa0
void MxVideoPresenter::StartingTickle()
{
MxStreamChunk* chunk = FUN_100b5650();
MxStreamChunk* chunk = CurrentChunk();
if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
CreateBitmap();
@@ -502,7 +502,7 @@ void MxVideoPresenter::StreamingTickle()
break;
LoadFrame(m_currentChunk);
m_subscriber->FUN_100b8390(m_currentChunk);
m_subscriber->DestroyChunk(m_currentChunk);
m_currentChunk = NULL;
m_flags |= Flag_Bit1;