isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-21 07:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix naming

Browse Source
This commit is contained in:
Christian Semmler 2024-12-22 13:15:33 -07:00
parent 49b03cbebd
commit 859bf5d1e6
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -404,13 +404,13 @@ LegoROI* LegoAnimPresenter::FUN_100699e0(const LegoChar* p_und)
// FUNCTION: LEGO1 0x10069b10 // FUNCTION: LEGO1 0x10069b10
void LegoAnimPresenter::FUN_10069b10() void LegoAnimPresenter::FUN_10069b10()
{ {
LegoAnimStructMap map; LegoAnimStructMap anims;
if (m_unk0x8c != NULL) { if (m_unk0x8c != NULL) {
memset(m_unk0x8c, 0, m_unk0x94 * sizeof(*m_unk0x8c)); memset(m_unk0x8c, 0, m_unk0x94 * sizeof(*m_unk0x8c));
} }
FUN_1006a3c0(map, m_anim->GetRoot(), NULL); FUN_1006a3c0(anims, m_anim->GetRoot(), NULL);
if (m_roiMap != NULL) { if (m_roiMap != NULL) {
delete[] m_roiMap; delete[] m_roiMap;
@ -418,10 +418,10 @@ void LegoAnimPresenter::FUN_10069b10()
} }
m_roiMapSize = 0; m_roiMapSize = 0;
m_roiMap = new LegoROI*[map.size() + 1]; m_roiMap = new LegoROI*[anims.size() + 1];
memset(m_roiMap, 0, (map.size() + 1) * sizeof(*m_roiMap)); memset(m_roiMap, 0, (anims.size() + 1) * sizeof(*m_roiMap));
for (LegoAnimStructMap::iterator it = map.begin(); it != map.end();) { for (LegoAnimStructMap::iterator it = anims.begin(); it != anims.end();) {
MxU32 index = (*it).second.m_index; MxU32 index = (*it).second.m_index;
m_roiMap[index] = (*it).second.m_roi; m_roiMap[index] = (*it).second.m_roi;

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

@ -143,18 +143,18 @@ void LegoHideAnimPresenter::FUN_1006db60(LegoTreeNode* p_node, LegoTime p_time)
// FUNCTION: BETA10 0x100532fd // FUNCTION: BETA10 0x100532fd
void LegoHideAnimPresenter::FUN_1006dc10() void LegoHideAnimPresenter::FUN_1006dc10()
{ {
LegoHideAnimStructMap map; LegoHideAnimStructMap anims;
FUN_1006e3f0(map, m_anim->GetRoot()); FUN_1006e3f0(anims, m_anim->GetRoot());
if (m_boundaryMap != NULL) { if (m_boundaryMap != NULL) {
delete[] m_boundaryMap; delete[] m_boundaryMap;
} }
m_boundaryMap = new LegoPathBoundary*[map.size() + 1]; m_boundaryMap = new LegoPathBoundary*[anims.size() + 1];
m_boundaryMap[0] = NULL; m_boundaryMap[0] = NULL;
for (LegoHideAnimStructMap::iterator it = map.begin(); !(it == map.end()); it++) { for (LegoHideAnimStructMap::iterator it = anims.begin(); !(it == anims.end()); it++) {
m_boundaryMap[(*it).second.m_index] = (*it).second.m_boundary; m_boundaryMap[(*it).second.m_index] = (*it).second.m_boundary;
delete[] const_cast<char*>((*it).first); delete[] const_cast<char*>((*it).first);
} }

8
LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
View File

@ -576,12 +576,12 @@ MxLong RegistrationBook::HandlePathStruct(LegoPathStructNotificationParam& p_par
// FUNCTION: LEGO1 0x10078350 // FUNCTION: LEGO1 0x10078350
MxBool RegistrationBook::CreateSurface() MxBool RegistrationBook::CreateSurface()
{ {
MxCompositePresenterList* list = m_checkmark[0]->GetList(); MxCompositePresenterList* presenters = m_checkmark[0]->GetList();
MxStillPresenter *presenter, *uninitialized; MxStillPresenter *presenter, *uninitialized;
if (list) { if (presenters) {
if (list->begin() != list->end()) { if (presenters->begin() != presenters->end()) {
presenter = (MxStillPresenter*) list->front(); presenter = (MxStillPresenter*) presenters->front();
} }
else { else {
presenter = uninitialized; // intentionally uninitialized variable presenter = uninitialized; // intentionally uninitialized variable

4
LEGO1/omni/src/main/mxomni.cpp
View File

@ -399,9 +399,9 @@ void MxOmni::SetSound3D(MxBool p_use3dSound)
MxBool MxOmni::DoesEntityExist(MxDSAction& p_dsAction) MxBool MxOmni::DoesEntityExist(MxDSAction& p_dsAction)
{ {
if (m_streamer->FUN_100b9b30(p_dsAction)) { if (m_streamer->FUN_100b9b30(p_dsAction)) {
MxNotificationPtrList* queue = m_notificationManager->GetQueue(); MxNotificationPtrList* notifications = m_notificationManager->GetQueue();
if (!queue || queue->size() == 0) { if (!notifications || notifications->size() == 0) {
return TRUE; return TRUE;
} }
} }

6
LEGO1/omni/src/video/mxsmkpresenter.cpp
View File

@ -72,15 +72,15 @@ void MxSmkPresenter::LoadFrame(MxStreamChunk* p_chunk)
m_currentFrame++; m_currentFrame++;
VTable0x88(); VTable0x88();
MxRectList list(TRUE); MxRectList rects(TRUE);
MxSmack::LoadFrame(bitmapInfo, bitmapData, &m_mxSmack, chunkData, paletteChanged, &list); MxSmack::LoadFrame(bitmapInfo, bitmapData, &m_mxSmack, chunkData, paletteChanged, &rects);
if (((MxDSMediaAction*) m_action)->GetPaletteManagement() && paletteChanged) { if (((MxDSMediaAction*) m_action)->GetPaletteManagement() && paletteChanged) {
RealizePalette(); RealizePalette();
} }
MxRect32 invalidateRect; MxRect32 invalidateRect;
MxRectListCursor cursor(&list); MxRectListCursor cursor(&rects);
MxRect32* rect; MxRect32* rect;
while (cursor.Next(rect)) { while (cursor.Next(rect)) {