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

Fix LegoBackgroundColor order

Browse Source
This commit is contained in:
Christian Semmler 2025-01-17 14:54:11 -07:00
parent e1ce96c473
commit eac59b7b31
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LEGO1/lego/legoomni/include/legogamestate.h
View File

@ -26,6 +26,7 @@ struct ColorStringStruct {
// SIZE 0x30 // SIZE 0x30
class LegoBackgroundColor : public MxVariable { class LegoBackgroundColor : public MxVariable {
public: public:
LegoBackgroundColor();
LegoBackgroundColor(const char* p_key, const char* p_value); LegoBackgroundColor(const char* p_key, const char* p_value);
void SetValue(const char* p_colorString) override; // vtable+0x04 void SetValue(const char* p_colorString) override; // vtable+0x04

21
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View File

@ -1084,6 +1084,7 @@ LegoState* LegoGameState::CreateState(const char* p_stateName)
} }
// FUNCTION: LEGO1 0x1003bc30 // FUNCTION: LEGO1 0x1003bc30
// FUNCTION: BETA10 0x1008636e
void LegoGameState::RegisterState(LegoState* p_state) void LegoGameState::RegisterState(LegoState* p_state)
{ {
MxS32 targetIndex; MxS32 targetIndex;
@ -1164,7 +1165,16 @@ void LegoGameState::Init()
m_unk0x42c = e_undefined; m_unk0x42c = e_undefined;
} }
// FUNCTION: BETA10 0x10086510
LegoBackgroundColor::LegoBackgroundColor()
{
m_h = 0.0f;
m_s = 0.0f;
m_v = 0.0f;
}
// FUNCTION: LEGO1 0x1003bfb0 // FUNCTION: LEGO1 0x1003bfb0
// FUNCTION: BETA10 0x1008659d
LegoBackgroundColor::LegoBackgroundColor(const char* p_key, const char* p_value) LegoBackgroundColor::LegoBackgroundColor(const char* p_key, const char* p_value)
{ {
m_key = p_key; m_key = p_key;
@ -1173,6 +1183,7 @@ LegoBackgroundColor::LegoBackgroundColor(const char* p_key, const char* p_value)
} }
// FUNCTION: LEGO1 0x1003c070 // FUNCTION: LEGO1 0x1003c070
// FUNCTION: BETA10 0x10086634
void LegoBackgroundColor::SetValue(const char* p_colorString) void LegoBackgroundColor::SetValue(const char* p_colorString)
{ {
m_value = p_colorString; m_value = p_colorString;
@ -1213,6 +1224,7 @@ void LegoBackgroundColor::SetValue(const char* p_colorString)
} }
// FUNCTION: LEGO1 0x1003c230 // FUNCTION: LEGO1 0x1003c230
// FUNCTION: BETA10 0x100867f9
void LegoBackgroundColor::ToggleDayNight(MxBool p_sun) void LegoBackgroundColor::ToggleDayNight(MxBool p_sun)
{ {
char buffer[30]; char buffer[30];
@ -1240,6 +1252,7 @@ void LegoBackgroundColor::ToggleDayNight(MxBool p_sun)
} }
// FUNCTION: LEGO1 0x1003c330 // FUNCTION: LEGO1 0x1003c330
// FUNCTION: BETA10 0x100868de
void LegoBackgroundColor::ToggleSkyColor() void LegoBackgroundColor::ToggleSkyColor()
{ {
char buffer[30]; char buffer[30];
@ -1259,6 +1272,7 @@ void LegoBackgroundColor::ToggleSkyColor()
} }
// FUNCTION: LEGO1 0x1003c400 // FUNCTION: LEGO1 0x1003c400
// FUNCTION: BETA10 0x10086984
void LegoBackgroundColor::SetLightColor(float p_r, float p_g, float p_b) void LegoBackgroundColor::SetLightColor(float p_r, float p_g, float p_b)
{ {
if (!VideoManager()->GetVideoParam().Flags().GetF2bit0()) { if (!VideoManager()->GetVideoParam().Flags().GetF2bit0()) {
@ -1293,6 +1307,7 @@ void LegoBackgroundColor::SetLightColor()
} }
// FUNCTION: LEGO1 0x1003c500 // FUNCTION: LEGO1 0x1003c500
// FUNCTION: BETA10 0x10086af6
LegoFullScreenMovie::LegoFullScreenMovie(const char* p_key, const char* p_value) LegoFullScreenMovie::LegoFullScreenMovie(const char* p_key, const char* p_value)
{ {
m_key = p_key; m_key = p_key;
@ -1301,6 +1316,7 @@ LegoFullScreenMovie::LegoFullScreenMovie(const char* p_key, const char* p_value)
} }
// FUNCTION: LEGO1 0x1003c5c0 // FUNCTION: LEGO1 0x1003c5c0
// FUNCTION: BETA10 0x10086b8d
void LegoFullScreenMovie::SetValue(const char* p_option) void LegoFullScreenMovie::SetValue(const char* p_option)
{ {
m_value = p_option; m_value = p_option;
@ -1310,12 +1326,9 @@ void LegoFullScreenMovie::SetValue(const char* p_option)
if (videomanager) { if (videomanager) {
if (!strcmp(m_value.GetData(), g_strEnable)) { if (!strcmp(m_value.GetData(), g_strEnable)) {
videomanager->EnableFullScreenMovie(TRUE); videomanager->EnableFullScreenMovie(TRUE);
return;
} }
else if (!strcmp(m_value.GetData(), g_strDisable)) {
if (!strcmp(m_value.GetData(), g_strDisable)) {
videomanager->EnableFullScreenMovie(FALSE); videomanager->EnableFullScreenMovie(FALSE);
return;
} }
} }
} }