From 594071766a6f3663ce6342de734075a5fd10977e Mon Sep 17 00:00:00 2001 From: Misha <106913236+MishaProductions@users.noreply.github.com> Date: Mon, 15 Jan 2024 09:46:36 -0500 Subject: [PATCH] fix wrong offset --- .../legoomni/include/legometerpresenter.h | 2 +- .../legoomni/src/video/legometerpresenter.cpp | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legometerpresenter.h b/LEGO1/lego/legoomni/include/legometerpresenter.h index 81fdc673..15b73945 100644 --- a/LEGO1/lego/legoomni/include/legometerpresenter.h +++ b/LEGO1/lego/legoomni/include/legometerpresenter.h @@ -8,7 +8,7 @@ class LegoMeterPresenter : public MxStillPresenter { public: LegoMeterPresenter(); - // FUNCTION: LEGO1 0x10043430 + // FUNCTION: LEGO1 0x10043550 virtual ~LegoMeterPresenter() override{}; // MxStillPresenter's `::ClassName` and `::IsA` are used. diff --git a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp index 5ca59844..50ac1fa7 100644 --- a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp @@ -5,25 +5,25 @@ #include "mxutil.h" // GLOBAL: LEGO1 0x1010207c -const char* g_FILTER_INDEX = "FILTER_INDEX"; +const char* g_filterIndex = "FILTER_INDEX"; // GLOBAL: LEGO1 0x10102094 -const char* g_TYPE = "TYPE"; +const char* g_type = "TYPE"; // GLOBAL: LEGO1 0x10102088 -const char* g_LEFT_TO_RIGHT = "LEFT_TO_RIGHT"; +const char* g_left_to_right = "LEFT_TO_RIGHT"; // GLOBAL: LEGO1 0x101020ac -const char* g_RIGHT_TO_LEFT = "RIGHT_TO_LEFT"; +const char* g_right_to_left = "RIGHT_TO_LEFT"; // GLOBAL: LEGO1 0x1010205c -const char* g_BOTTOM_TO_TOP = "BOTTOM_TO_TOP"; +const char* g_bottom_to_top = "BOTTOM_TO_TOP"; // GLOBAL: LEGO1 0x101020c0 -const char* g_TOP_TO_BOTTOM = "TOP_TO_BOTTOM"; +const char* g_top_to_bottom = "TOP_TO_BOTTOM"; // GLOBAL: LEGO1 0x101020c8 -const char* g_VARIABLE = "VARIABLE"; +const char* g_variable = "VARIABLE"; // Uncomment when member class variables are fleshed out. DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94); // 0x1000a163 @@ -50,26 +50,26 @@ void LegoMeterPresenter::ParseExtra() memcpy(buffer, m_action->GetExtraData(), *((MxU16*) &result[0])); - if (KeyValueStringParse(buffer, g_TYPE, result)) { - if (!strcmp(result, g_LEFT_TO_RIGHT)) { + if (KeyValueStringParse(buffer, g_type, result)) { + if (!strcmp(result, g_left_to_right)) { m_layout = 0; } - else if (!strcmp(result, g_RIGHT_TO_LEFT)) { + else if (!strcmp(result, g_right_to_left)) { m_layout = 1; } - else if (!strcmp(result, g_BOTTOM_TO_TOP)) { + else if (!strcmp(result, g_bottom_to_top)) { m_layout = 2; } - else if (!strcmp(result, g_TOP_TO_BOTTOM)) { + else if (!strcmp(result, g_top_to_bottom)) { m_layout = 3; } } - if (KeyValueStringParse(buffer, g_FILTER_INDEX, result)) { + if (KeyValueStringParse(buffer, g_filterIndex, result)) { m_type = atoi(result); } - if (KeyValueStringParse(buffer, g_VARIABLE, result)) { + if (KeyValueStringParse(buffer, g_variable, result)) { m_variable = result; return; }