isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-26 17:36:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor style/naming fixes (#593)

Browse source
This commit is contained in:
Christian Semmler 2024-02-25 09:14:39 -05:00 committed by GitHub
parent b281866ea6
commit 377eebb610
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legoanimpresenter.h
View file

@ -38,7 +38,7 @@ class LegoAnimPresenter : public MxVideoPresenter {
MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
void EndAction() override; // vtable+0x40 void EndAction() override; // vtable+0x40
void PutFrame() override; // vtable+0x6c void PutFrame() override; // vtable+0x6c
virtual MxResult VTable0x88(MxStreamChunk* p_chunk); // vtable+0x88 virtual MxResult CreateAnim(MxStreamChunk* p_chunk); // vtable+0x88
inline LegoAnim* GetAnimation() { return m_anim; } inline LegoAnim* GetAnimation() { return m_anim; }

2
LEGO1/lego/legoomni/include/legocachesoundlist.h
View file

@ -38,7 +38,7 @@ class LegoCacheSoundList : public MxPtrList<LegoCacheSound> {
// SIZE 0x10 // SIZE 0x10
class LegoCacheSoundListCursor : public MxPtrListCursor<LegoCacheSound> { class LegoCacheSoundListCursor : public MxPtrListCursor<LegoCacheSound> {
public: public:
LegoCacheSoundListCursor(LegoCacheSoundList* p_list) : MxPtrListCursor<LegoCacheSound>(p_list){}; LegoCacheSoundListCursor(LegoCacheSoundList* p_list) : MxPtrListCursor<LegoCacheSound>(p_list) {}
}; };
// TEMPLATE: LEGO1 0x1001e670 // TEMPLATE: LEGO1 0x1001e670

2
LEGO1/lego/legoomni/include/legoentitylist.h
View file

@ -38,7 +38,7 @@ class LegoEntityList : public MxPtrList<LegoEntity> {
// SIZE 0x10 // SIZE 0x10
class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> { class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
public: public:
LegoEntityListCursor(LegoEntityList* p_list) : MxPtrListCursor<LegoEntity>(p_list){}; LegoEntityListCursor(LegoEntityList* p_list) : MxPtrListCursor<LegoEntity>(p_list) {}
}; };
// TEMPLATE: LEGO1 0x1001e2f0 // TEMPLATE: LEGO1 0x1001e2f0

2
LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
View file

@ -30,7 +30,7 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
void Destroy() override; // vtable+0x38 void Destroy() override; // vtable+0x38
void EndAction() override; // vtable+0x40 void EndAction() override; // vtable+0x40
void PutFrame() override; // vtable+0x6c void PutFrame() override; // vtable+0x6c
MxResult VTable0x88(MxStreamChunk* p_chunk) override; // vtable+0x88 MxResult CreateAnim(MxStreamChunk* p_chunk) override; // vtable+0x88
// SYNTHETIC: LEGO1 0x1006cfe0 // SYNTHETIC: LEGO1 0x1006cfe0
// LegoLocomotionAnimPresenter::`scalar deleting destructor' // LegoLocomotionAnimPresenter::`scalar deleting destructor'

2
LEGO1/lego/legoomni/include/legopathcontrollerlist.h
View file

@ -37,7 +37,7 @@ class LegoPathControllerList : public MxPtrList<LegoPathController> {
// SIZE 0x10 // SIZE 0x10
class LegoPathControllerListCursor : public MxPtrListCursor<LegoPathController> { class LegoPathControllerListCursor : public MxPtrListCursor<LegoPathController> {
public: public:
LegoPathControllerListCursor(LegoPathControllerList* p_list) : MxPtrListCursor<LegoPathController>(p_list){}; LegoPathControllerListCursor(LegoPathControllerList* p_list) : MxPtrListCursor<LegoPathController>(p_list) {}
}; };
// TEMPLATE: LEGO1 0x1001d230 // TEMPLATE: LEGO1 0x1001d230

2
LEGO1/lego/legoomni/include/legoworldlist.h
View file

@ -38,7 +38,7 @@ class LegoWorldList : public MxPtrList<LegoWorld> {
// SIZE 0x10 // SIZE 0x10
class LegoWorldListCursor : public MxPtrListCursor<LegoWorld> { class LegoWorldListCursor : public MxPtrListCursor<LegoWorld> {
public: public:
LegoWorldListCursor(LegoWorldList* p_list) : MxPtrListCursor<LegoWorld>(p_list){}; LegoWorldListCursor(LegoWorldList* p_list) : MxPtrListCursor<LegoWorld>(p_list) {}
}; };
// SYNTHETIC: LEGO1 0x1003e870 // SYNTHETIC: LEGO1 0x1003e870

4
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View file

@ -54,7 +54,7 @@ void LegoAnimPresenter::Destroy(MxBool p_fromDestructor)
} }
// FUNCTION: LEGO1 0x10068fb0 // FUNCTION: LEGO1 0x10068fb0
MxResult LegoAnimPresenter::VTable0x88(MxStreamChunk* p_chunk) MxResult LegoAnimPresenter::CreateAnim(MxStreamChunk* p_chunk)
{ {
MxResult result = FAILURE; MxResult result = FAILURE;
LegoMemory storage(p_chunk->GetData()); LegoMemory storage(p_chunk->GetData());
@ -120,7 +120,7 @@ void LegoAnimPresenter::ReadyTickle()
if (chunk && chunk->GetTime() + m_action->GetStartTime() <= m_action->GetElapsedTime()) { if (chunk && chunk->GetTime() + m_action->GetStartTime() <= m_action->GetElapsedTime()) {
chunk = m_subscriber->PopData(); chunk = m_subscriber->PopData();
MxResult result = VTable0x88(chunk); MxResult result = CreateAnim(chunk);
m_subscriber->FreeDataChunk(chunk); m_subscriber->FreeDataChunk(chunk);
if (result == SUCCESS) { if (result == SUCCESS) {

4
LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
View file

@ -52,9 +52,9 @@ void LegoLocomotionAnimPresenter::Destroy(MxBool p_fromDestructor)
} }
// FUNCTION: LEGO1 0x1006d140 // FUNCTION: LEGO1 0x1006d140
MxResult LegoLocomotionAnimPresenter::VTable0x88(MxStreamChunk* p_chunk) MxResult LegoLocomotionAnimPresenter::CreateAnim(MxStreamChunk* p_chunk)
{ {
MxResult result = LegoAnimPresenter::VTable0x88(p_chunk); MxResult result = LegoAnimPresenter::CreateAnim(p_chunk);
return result == SUCCESS ? SUCCESS : result; return result == SUCCESS ? SUCCESS : result;
} }

4
LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
View file

@ -214,7 +214,7 @@ void LegoModelPresenter::ReadyTickle()
if (m_roi != NULL) { if (m_roi != NULL) {
if (m_compositePresenter && m_compositePresenter->IsA("LegoEntityPresenter")) { if (m_compositePresenter && m_compositePresenter->IsA("LegoEntityPresenter")) {
((LegoEntityPresenter*) m_compositePresenter)->GetEntity()->SetROI((LegoROI*) m_roi, m_addedToView, TRUE); ((LegoEntityPresenter*) m_compositePresenter)->GetEntity()->SetROI(m_roi, m_addedToView, TRUE);
((LegoEntityPresenter*) m_compositePresenter) ((LegoEntityPresenter*) m_compositePresenter)
->GetEntity() ->GetEntity()
->SetFlags( ->SetFlags(
@ -240,7 +240,7 @@ void LegoModelPresenter::ReadyTickle()
VideoManager()->Get3DManager()->GetLego3DView()->Moved(*m_roi); VideoManager()->Get3DManager()->GetLego3DView()->Moved(*m_roi);
if (m_compositePresenter != NULL && m_compositePresenter->IsA("LegoEntityPresenter")) { if (m_compositePresenter != NULL && m_compositePresenter->IsA("LegoEntityPresenter")) {
((LegoEntityPresenter*) m_compositePresenter)->GetEntity()->SetROI((LegoROI*) m_roi, TRUE, TRUE); ((LegoEntityPresenter*) m_compositePresenter)->GetEntity()->SetROI(m_roi, TRUE, TRUE);
((LegoEntityPresenter*) m_compositePresenter) ((LegoEntityPresenter*) m_compositePresenter)
->GetEntity() ->GetEntity()
->SetFlags( ->SetFlags(

5
LEGO1/lego/sources/misc/legocontainer.h
View file

@ -13,7 +13,10 @@
#pragma warning(disable : 4237) #pragma warning(disable : 4237)
struct LegoContainerInfoComparator { struct LegoContainerInfoComparator {
LegoU8 operator()(const char* const& p_key0, const char* const& p_key1) const { return strcmp(p_key0, p_key1) > 0; } LegoBool operator()(const char* const& p_key0, const char* const& p_key1) const
{
return strcmp(p_key0, p_key1) > 0;
}
}; };
// SIZE 0x10 // SIZE 0x10

2
LEGO1/lego/sources/misc/legostorage.h
View file

@ -20,7 +20,7 @@ class LegoStorage {
LegoStorage() : m_mode(0) {} LegoStorage() : m_mode(0) {}
// FUNCTION: LEGO1 0x10045ad0 // FUNCTION: LEGO1 0x10045ad0
virtual ~LegoStorage(){}; virtual ~LegoStorage() {}
virtual LegoResult Read(void* p_buffer, LegoU32 p_size) = 0; virtual LegoResult Read(void* p_buffer, LegoU32 p_size) = 0;
virtual LegoResult Write(const void* p_buffer, LegoU32 p_size) = 0; virtual LegoResult Write(const void* p_buffer, LegoU32 p_size) = 0;

2
LEGO1/omni/include/mxcollection.h
View file

@ -12,7 +12,7 @@ class MxCollection : public MxCore {
SetDestroy(Destroy); SetDestroy(Destroy);
} }
static void Destroy(T){}; static void Destroy(T) {}
void SetDestroy(void (*p_customDestructor)(T)) { this->m_customDestructor = p_customDestructor; } void SetDestroy(void (*p_customDestructor)(T)) { this->m_customDestructor = p_customDestructor; }

2
LEGO1/omni/include/mxdsactionlist.h
View file

@ -41,7 +41,7 @@ class MxDSActionList : public MxList<MxDSAction*> {
// SIZE 0x10 // SIZE 0x10
class MxDSActionListCursor : public MxListCursor<MxDSAction*> { class MxDSActionListCursor : public MxListCursor<MxDSAction*> {
public: public:
MxDSActionListCursor(MxDSActionList* p_list) : MxListCursor<MxDSAction*>(p_list){}; MxDSActionListCursor(MxDSActionList* p_list) : MxListCursor<MxDSAction*>(p_list) {}
}; };
// TEMPLATE: LEGO1 0x100c9cc0 // TEMPLATE: LEGO1 0x100c9cc0

2
LEGO1/omni/include/mxlist.h
View file

@ -135,7 +135,7 @@ class MxListCursor : public MxCore {
template <class T> template <class T>
class MxPtrListCursor : public MxListCursor<T*> { class MxPtrListCursor : public MxListCursor<T*> {
public: public:
MxPtrListCursor(MxPtrList<T>* p_list) : MxListCursor<T*>(p_list){}; MxPtrListCursor(MxPtrList<T>* p_list) : MxListCursor<T*>(p_list) {}
}; };
template <class T> template <class T>

2
LEGO1/omni/include/mxpresenterlist.h
View file

@ -32,7 +32,7 @@ class MxPresenterList : public MxPtrList<MxPresenter> {
// VTABLE: LEGO1 0x100d6470 // VTABLE: LEGO1 0x100d6470
class MxPresenterListCursor : public MxPtrListCursor<MxPresenter> { class MxPresenterListCursor : public MxPtrListCursor<MxPresenter> {
public: public:
MxPresenterListCursor(MxPresenterList* p_list) : MxPtrListCursor<MxPresenter>(p_list){}; MxPresenterListCursor(MxPresenterList* p_list) : MxPtrListCursor<MxPresenter>(p_list) {}
}; };
// VTABLE: LEGO1 0x100d6350 // VTABLE: LEGO1 0x100d6350

2
LEGO1/omni/include/mxrectlist.h
View file

@ -20,7 +20,7 @@ class MxRectList : public MxPtrList<MxRect32> {
// VTABLE: LEGO1 0x100dc420 // VTABLE: LEGO1 0x100dc420
class MxRectListCursor : public MxPtrListCursor<MxRect32> { class MxRectListCursor : public MxPtrListCursor<MxRect32> {
public: public:
MxRectListCursor(MxRectList* p_list) : MxPtrListCursor<MxRect32>(p_list){}; MxRectListCursor(MxRectList* p_list) : MxPtrListCursor<MxRect32>(p_list) {}
}; };
// VTABLE: LEGO1 0x100dc3d8 // VTABLE: LEGO1 0x100dc3d8

4
LEGO1/omni/include/mxregionlist.h
View file

@ -54,7 +54,7 @@ class MxRegionLeftRightList : public MxPtrList<MxRegionLeftRight> {
// VTABLE: LEGO1 0x100dcc10 // VTABLE: LEGO1 0x100dcc10
class MxRegionLeftRightListCursor : public MxPtrListCursor<MxRegionLeftRight> { class MxRegionLeftRightListCursor : public MxPtrListCursor<MxRegionLeftRight> {
public: public:
MxRegionLeftRightListCursor(MxRegionLeftRightList* p_list) : MxPtrListCursor<MxRegionLeftRight>(p_list){}; MxRegionLeftRightListCursor(MxRegionLeftRightList* p_list) : MxPtrListCursor<MxRegionLeftRight>(p_list) {}
}; };
// SIZE 0x0c // SIZE 0x0c
@ -116,7 +116,7 @@ class MxRegionTopBottomList : public MxPtrList<MxRegionTopBottom> {
// VTABLE: LEGO1 0x100dcb88 // VTABLE: LEGO1 0x100dcb88
class MxRegionTopBottomListCursor : public MxPtrListCursor<MxRegionTopBottom> { class MxRegionTopBottomListCursor : public MxPtrListCursor<MxRegionTopBottom> {
public: public:
MxRegionTopBottomListCursor(MxPtrList<MxRegionTopBottom>* p_list) : MxPtrListCursor<MxRegionTopBottom>(p_list){}; MxRegionTopBottomListCursor(MxPtrList<MxRegionTopBottom>* p_list) : MxPtrListCursor<MxRegionTopBottom>(p_list) {}
}; };
// TEMPLATE: LEGO1 0x100c32e0 // TEMPLATE: LEGO1 0x100c32e0

2
LEGO1/omni/include/mxstreamchunklist.h
View file

@ -35,7 +35,7 @@ class MxStreamChunkList : public MxList<MxStreamChunk*> {
// SIZE 0x10 // SIZE 0x10
class MxStreamChunkListCursor : public MxListCursor<MxStreamChunk*> { class MxStreamChunkListCursor : public MxListCursor<MxStreamChunk*> {
public: public:
MxStreamChunkListCursor(MxStreamChunkList* p_list) : MxListCursor<MxStreamChunk*>(p_list){}; MxStreamChunkListCursor(MxStreamChunkList* p_list) : MxListCursor<MxStreamChunk*>(p_list) {}
}; };
// VTABLE: LEGO1 0x100dc528 // VTABLE: LEGO1 0x100dc528

2
LEGO1/omni/include/mxstringlist.h
View file

@ -12,7 +12,7 @@ class MxStringList : public MxList<MxString> {};
// SIZE 0x10 // SIZE 0x10
class MxStringListCursor : public MxListCursor<MxString> { class MxStringListCursor : public MxListCursor<MxString> {
public: public:
MxStringListCursor(MxStringList* p_list) : MxListCursor<MxString>(p_list){}; MxStringListCursor(MxStringList* p_list) : MxListCursor<MxString>(p_list) {}
// SYNTHETIC: LEGO1 0x100cb860 // SYNTHETIC: LEGO1 0x100cb860
// MxStringList::`scalar deleting destructor' // MxStringList::`scalar deleting destructor'

8
LEGO1/omni/include/mxvideopresenter.h
View file

@ -43,20 +43,20 @@ class MxVideoPresenter : public MxMediaPresenter {
MxBool IsHit(MxS32 p_x, MxS32 p_y) override; // vtable+0x50 MxBool IsHit(MxS32 p_x, MxS32 p_y) override; // vtable+0x50
// FUNCTION: LEGO1 0x1000c700 // FUNCTION: LEGO1 0x1000c700
virtual void LoadHeader(MxStreamChunk* p_chunk){}; // vtable+0x5c virtual void LoadHeader(MxStreamChunk* p_chunk) {} // vtable+0x5c
// FUNCTION: LEGO1 0x1000c710 // FUNCTION: LEGO1 0x1000c710
virtual void CreateBitmap(){}; // vtable+0x60 virtual void CreateBitmap() {} // vtable+0x60
virtual void NextFrame(); // vtable+0x64 virtual void NextFrame(); // vtable+0x64
// FUNCTION: LEGO1 0x1000c720 // FUNCTION: LEGO1 0x1000c720
virtual void LoadFrame(MxStreamChunk* p_chunk){}; // vtable+0x68 virtual void LoadFrame(MxStreamChunk* p_chunk) {} // vtable+0x68
virtual void PutFrame(); // vtable+0x6c virtual void PutFrame(); // vtable+0x6c
// FUNCTION: LEGO1 0x1000c730 // FUNCTION: LEGO1 0x1000c730
virtual void RealizePalette(){}; // vtable+0x70 virtual void RealizePalette() {} // vtable+0x70
virtual undefined VTable0x74(); // vtable+0x74 virtual undefined VTable0x74(); // vtable+0x74