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

Fix CI, address review comments

Browse Source
This commit is contained in:
jonschz 2024-08-17 20:24:56 +02:00
parent 9964c99b06
commit c264fa3cf3
5 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legovideomanager.h
View File

@ -34,9 +34,6 @@ class LegoVideoManager : public MxVideoManager {
MxResult Tickle() override; // vtable+0x08 MxResult Tickle() override; // vtable+0x08
void Destroy() override; // vtable+0x18 void Destroy() override; // vtable+0x18
MxResult Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread) override; // vtable+0x2c MxResult Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread) override; // vtable+0x2c
MxPresenter* GetPresenterByActionObjectName(char* p_char);
MxResult RealizePalette(MxPalette*) override; // vtable+0x30 MxResult RealizePalette(MxPalette*) override; // vtable+0x30
void UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34 void UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34
virtual MxPresenter* GetPresenterAt(MxS32 p_x, MxS32 p_y); // vtable+0x38 virtual MxPresenter* GetPresenterAt(MxS32 p_x, MxS32 p_y); // vtable+0x38
@ -47,6 +44,7 @@ class LegoVideoManager : public MxVideoManager {
void SetSkyColor(float p_red, float p_green, float p_blue); void SetSkyColor(float p_red, float p_green, float p_blue);
void OverrideSkyColor(MxBool p_shouldOverride); void OverrideSkyColor(MxBool p_shouldOverride);
MxResult ResetPalette(MxBool p_ignoreSkyColor); MxResult ResetPalette(MxBool p_ignoreSkyColor);
MxPresenter* GetPresenterByActionObjectName(const char* p_char);
void FUN_1007c520(); void FUN_1007c520();

8
LEGO1/lego/legoomni/src/race/legoracemap.cpp
View File

@ -30,11 +30,11 @@ LegoRaceMap::~LegoRaceMap()
// GLOBAL: LEGO1 0x1010208c // GLOBAL: LEGO1 0x1010208c
// STRING: LEGO1 0x10101f88 // STRING: LEGO1 0x10101f88
const char* g_MAP_LOCATOR = "MAP_LOCATOR"; const char* g_mapLocator = "MAP_LOCATOR";
// GLOBAL: LEGO1 0x10102090 // GLOBAL: LEGO1 0x10102090
// STRING: LEGO1 0x10101f78 // STRING: LEGO1 0x10101f78
const char* g_MAP_GEOMETRY = "MAP_GEOMETRY"; const char* g_mapGeometry = "MAP_GEOMETRY";
// FUNCTION: LEGO1 0x1005d310 // FUNCTION: LEGO1 0x1005d310
// FUNCTION: BETA10 0x100ca543 // FUNCTION: BETA10 0x100ca543
@ -42,7 +42,7 @@ void LegoRaceMap::ParseAction(char* p_extra)
{ {
char value[256]; char value[256];
if (KeyValueStringParse(value, g_MAP_LOCATOR, p_extra)) { if (KeyValueStringParse(value, g_mapLocator, p_extra)) {
// variable name verified by BETA10 0x100ca5ac // variable name verified by BETA10 0x100ca5ac
MxStillPresenter* p = (MxStillPresenter*) VideoManager()->GetPresenterByActionObjectName(value); MxStillPresenter* p = (MxStillPresenter*) VideoManager()->GetPresenterByActionObjectName(value);
@ -51,7 +51,7 @@ void LegoRaceMap::ParseAction(char* p_extra)
m_stillPresenter = p; m_stillPresenter = p;
} }
if (KeyValueStringParse(value, g_MAP_GEOMETRY, p_extra)) { if (KeyValueStringParse(value, g_mapGeometry, p_extra)) {
char* token = strtok(value, g_parseExtraTokens); char* token = strtok(value, g_parseExtraTokens);
if (token != NULL) { if (token != NULL) {
m_unk0x14 = atof(token); m_unk0x14 = atof(token);

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

@ -411,12 +411,12 @@ MxPresenter* LegoVideoManager::GetPresenterAt(MxS32 p_x, MxS32 p_y)
// FUNCTION: LEGO1 0x1007c180 // FUNCTION: LEGO1 0x1007c180
// FUNCTION: BETA10 0x100d6df4 // FUNCTION: BETA10 0x100d6df4
MxPresenter* LegoVideoManager::GetPresenterByActionObjectName(char *p_actionObjectName) { MxPresenter* LegoVideoManager::GetPresenterByActionObjectName(const char* p_actionObjectName)
{
MxPresenterListCursor cursor(m_presenters); MxPresenterListCursor cursor(m_presenters);
MxPresenter* presenter; MxPresenter* presenter;
while (true) { while (TRUE) {
if (!cursor.Prev(presenter)) { if (!cursor.Prev(presenter)) {
return NULL; return NULL;
} }

4
LEGO1/omni/include/mxpresenterlist.h
View File

@ -23,8 +23,6 @@ class MxPresenterList : public MxPtrList<MxPresenter> {
// MxPresenterList::`scalar deleting destructor' // MxPresenterList::`scalar deleting destructor'
}; };
DECOMP_SIZE_ASSERT(MxPresenterList, 0x18)
// VTABLE: LEGO1 0x100d6488 // VTABLE: LEGO1 0x100d6488
// class MxListCursor<MxPresenter *> // class MxListCursor<MxPresenter *>
@ -39,8 +37,6 @@ class MxPresenterListCursor : public MxPtrListCursor<MxPresenter> {
MxPresenterListCursor(MxPresenterList* p_list) : MxPtrListCursor<MxPresenter>(p_list) {} MxPresenterListCursor(MxPresenterList* p_list) : MxPtrListCursor<MxPresenter>(p_list) {}
}; };
DECOMP_SIZE_ASSERT(MxPresenterListCursor, 0x10)
// VTABLE: LEGO1 0x100d6350 // VTABLE: LEGO1 0x100d6350
// class MxCollection<MxPresenter *> // class MxCollection<MxPresenter *>

1
tools/ncc/skip.yml
View File

@ -30,3 +30,4 @@ i_activity: "Allow original naming from beta"
i_actor: "Allow original naming from beta" i_actor: "Allow original naming from beta"
score: "Allow original naming from beta" score: "Allow original naming from beta"
c_LOCATIONS_NUM: "Allow original naming from beta" c_LOCATIONS_NUM: "Allow original naming from beta"
m_Map_Ctl: "Allow original naming from beta"