Adapt MxRegion.h

isledecomp · Feb 22, 2025 · 20538fa · 20538fa
1 parent ea5a722
commit 20538fa
Show file tree

Hide file tree

Showing 14 changed files with 913 additions and 904 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -264,7 +264,6 @@ function(add_lego_libraries NAME)
     LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
     LEGO1/omni/src/event/mxeventpresenter.cpp
     LEGO1/omni/src/stream/mxstreamchunk.cpp
-    LEGO1/omni/src/video/mxregioncursor.cpp
     LEGO1/omni/src/video/mxregion.cpp
     LEGO1/omni/src/video/mxsmk.cpp
     LEGO1/omni/src/stream/mxramstreamcontroller.cpp

diff --git a/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp
@@ -192,7 +192,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerNotificationParam* p_p
 void MxControlPresenter::VTable0x6c(MxS16 p_unk0x4e)
 {
 	if (p_unk0x4e == -1) {
-		if ((MxS16) ((MxDSMultiAction*) m_action)->GetActionList()->GetCount() - m_unk0x4e == 1) {
+		if ((MxS16) ((MxDSMultiAction*) m_action)->GetActionList()->GetNumElements() - m_unk0x4e == 1) {
 			m_unk0x4e = 0;
 		}
 		else {

diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
@@ -58,7 +58,7 @@ void LegoControlManager::Unregister(MxCore* p_listener)
 // FUNCTION: LEGO1 0x10029210
 MxBool LegoControlManager::FUN_10029210(LegoEventNotificationParam& p_param, MxPresenter* p_presenter)
 {
-	if (m_presenterList != NULL && m_presenterList->GetCount() != 0) {
+	if (m_presenterList != NULL && m_presenterList->GetNumElements() != 0) {
 		m_unk0x14 = p_presenter;
 
 		if (p_param.GetNotification() == c_notificationButtonUp ||

diff --git a/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
@@ -114,7 +114,7 @@ void LegoLocomotionAnimPresenter::StartingTickle()
 		m_subscriber->FreeDataChunk(chunk);
 	}
 
-	if (m_roiMapList->GetCount() != 0) {
+	if (m_roiMapList->GetNumElements() != 0) {
 		ProgressTickleState(e_streaming);
 	}
 }

diff --git a/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
@@ -250,7 +250,7 @@ void LegoPartPresenter::Store()
 		ViewLODList* lodList = GetViewLODListManager()->Lookup(part->GetName()->GetData());
 
 		if (lodList == NULL) {
-			lodList = GetViewLODListManager()->Create(part->GetName()->GetData(), part->GetList()->GetCount());
+			lodList = GetViewLODListManager()->Create(part->GetName()->GetData(), part->GetList()->GetNumElements());
 
 			LegoLODListCursor lodCursor(part->GetList());
 			LegoLOD* lod;

diff --git a/LEGO1/omni/include/mxlist.h b/LEGO1/omni/include/mxlist.h
@@ -52,7 +52,7 @@ class MxList : protected MxCollection<T> {
 	void Prepend(T p_obj) { InsertEntry(p_obj, NULL, this->m_first); }
 	void DeleteAll();
 	void Empty();
-	MxU32 GetCount() { return this->m_count; }
+	MxU32 GetNumElements() { return this->m_count; }
 
 	friend class MxListCursor<T>;
 	using MxCollection<T>::SetDestroy;