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

Match functions

Browse Source
This commit is contained in:
Christian Semmler 2024-01-15 10:13:33 -05:00
parent f55bcf40d1
commit 98c74c972e
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LEGO1/lego/legoomni/include/legometerpresenter.h
View File

@ -8,7 +8,7 @@
class LegoMeterPresenter : public MxStillPresenter { class LegoMeterPresenter : public MxStillPresenter {
public: public:
LegoMeterPresenter(); LegoMeterPresenter();
virtual ~LegoMeterPresenter(); virtual ~LegoMeterPresenter() override;
// MxStillPresenter's `::ClassName` and `::IsA` are used. // MxStillPresenter's `::ClassName` and `::IsA` are used.
@ -17,6 +17,8 @@ class LegoMeterPresenter : public MxStillPresenter {
virtual void ParseExtra() override; // vtable+0x30 virtual void ParseExtra() override; // vtable+0x30
private: private:
void FUN_10043a50();
MxU8* m_unk0x6c; // 0x6c MxU8* m_unk0x6c; // 0x6c
MxU16 m_type; // 0x70 MxU16 m_type; // 0x70
MxString m_variable; // 0x74 MxString m_variable; // 0x74
@ -26,8 +28,9 @@ class LegoMeterPresenter : public MxStillPresenter {
MxU16 m_unk0x8c; // 0x8c MxU16 m_unk0x8c; // 0x8c
MxU16 m_unk0x8e; // 0x8e MxU16 m_unk0x8e; // 0x8e
MxU16 m_layout; // 0x90 MxU16 m_layout; // 0x90
void FUN_10043a50();
}; };
// SYNTHETIC: LEGO1 0x10043760
// LegoMeterPresenter::`scalar deleting destructor'
#endif // LEGOMETERPRESENTER_H #endif // LEGOMETERPRESENTER_H

38
LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
View File

@ -4,6 +4,8 @@
#include "mxbitmap.h" #include "mxbitmap.h"
#include "mxutil.h" #include "mxutil.h"
DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94)
// GLOBAL: LEGO1 0x1010207c // GLOBAL: LEGO1 0x1010207c
const char* g_filterIndex = "FILTER_INDEX"; const char* g_filterIndex = "FILTER_INDEX";
@ -25,18 +27,16 @@ const char* g_topToBottom = "TOP_TO_BOTTOM";
// GLOBAL: LEGO1 0x101020c8 // 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
// FUNCTION: LEGO1 0x10043430 // FUNCTION: LEGO1 0x10043430
LegoMeterPresenter::LegoMeterPresenter() LegoMeterPresenter::LegoMeterPresenter()
{ {
m_layout = 0; m_layout = 0;
m_flags &= ~Flag_Bit2;
m_type = 1;
m_unk0x6c = 0; m_unk0x6c = 0;
m_unk0x84 = 0; m_unk0x84 = 0;
m_type = 1;
m_flags &= ~Flag_Bit2;
} }
// FUNCTION: LEGO1 0x10043780 // FUNCTION: LEGO1 0x10043780
LegoMeterPresenter::~LegoMeterPresenter() LegoMeterPresenter::~LegoMeterPresenter()
{ {
@ -46,26 +46,29 @@ LegoMeterPresenter::~LegoMeterPresenter()
// FUNCTION: LEGO1 0x10043800 // FUNCTION: LEGO1 0x10043800
void LegoMeterPresenter::ParseExtra() void LegoMeterPresenter::ParseExtra()
{ {
char buffer[256];
MxStillPresenter::ParseExtra(); MxStillPresenter::ParseExtra();
*((MxU16*) &buffer[0]) = m_action->GetExtraLength();
char* extraData = m_action->GetExtraData();
if (*((MxU16*) &buffer[0])) {
MxU16 len = *((MxU16*) &buffer[0]);
memcpy(buffer, extraData, len);
buffer[len] = '\0';
if (m_action->GetExtraLength()) {
char buffer[256];
char result[256]; char result[256];
*((MxU16*) &result[0]) = m_action->GetExtraLength();
memcpy(buffer, m_action->GetExtraData(), *((MxU16*) &result[0]));
if (KeyValueStringParse(buffer, g_type, result)) { if (KeyValueStringParse(buffer, g_type, result)) {
if (!strcmp(result, g_leftToRight)) { if (!strcmpi(result, g_leftToRight)) {
m_layout = 0; m_layout = 0;
} }
else if (!strcmp(result, g_rightToLeft)) { else if (!strcmpi(result, g_rightToLeft)) {
m_layout = 1; m_layout = 1;
} }
else if (!strcmp(result, g_bottomToTop)) { else if (!strcmpi(result, g_bottomToTop)) {
m_layout = 2; m_layout = 2;
} }
else if (!strcmp(result, g_topToBottom)) { else if (!strcmpi(result, g_topToBottom)) {
m_layout = 3; m_layout = 3;
} }
} }
@ -90,12 +93,13 @@ void LegoMeterPresenter::ParseExtra()
void LegoMeterPresenter::StreamingTickle() void LegoMeterPresenter::StreamingTickle()
{ {
MxStillPresenter::StreamingTickle(); MxStillPresenter::StreamingTickle();
m_unk0x6c = new MxU8[((m_bitmap->GetBmiWidth() + 3) & -4) * m_bitmap->GetBmiHeightAbs()]; m_unk0x6c = new MxU8[m_bitmap->GetBmiStride() * m_bitmap->GetBmiHeightAbs()];
if (m_unk0x6c == NULL) { if (m_unk0x6c == NULL) {
EndAction(); EndAction();
} }
memcpy(m_unk0x6c, m_bitmap->GetBitmapData(), ((m_bitmap->GetBmiWidth() + 3) & -4) * m_bitmap->GetBmiHeightAbs()); memcpy(m_unk0x6c, m_bitmap->GetBitmapData(), m_bitmap->GetBmiStride() * m_bitmap->GetBmiHeightAbs());
m_unk0x88 = 0; m_unk0x88 = 0;
m_unk0x8a = 0; m_unk0x8a = 0;
m_unk0x8c = m_bitmap->GetBmiWidth() - 1; m_unk0x8c = m_bitmap->GetBmiWidth() - 1;