From 2a88d06ff96ab7b8a8da23f368c0d7a9cef7b0ef Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 12 Jun 2024 09:53:33 -0400
Subject: [PATCH] Match LegoMeterPresenter::ParseExtra (#1022)
* Match LegoMeterPresenter::ParseExtra
* Add LegoMeterPresenter to factory
* Add call to parent
* Add missing TODO
---
LEGO1/lego/legoomni/include/legoobjectfactory.h | 2 +-
LEGO1/lego/legoomni/src/actors/ambulance.cpp | 1 +
LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp | 2 +-
LEGO1/lego/legoomni/src/control/legometerpresenter.cpp | 7 ++++---
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/LEGO1/lego/legoomni/include/legoobjectfactory.h b/LEGO1/lego/legoomni/include/legoobjectfactory.h
index ceb5f56e..37d54fb3 100644
--- a/LEGO1/lego/legoomni/include/legoobjectfactory.h
+++ b/LEGO1/lego/legoomni/include/legoobjectfactory.h
@@ -21,7 +21,7 @@
X(LegoPartPresenter) \
X(LegoCarBuildAnimPresenter) \
X(LegoActionControlPresenter) \
- X(MxVideoPresenter) \
+ X(LegoMeterPresenter) \
X(LegoLoadCacheSoundPresenter) \
X(Lego3DWavePresenter) \
X(LegoActor) \
diff --git a/LEGO1/lego/legoomni/src/actors/ambulance.cpp b/LEGO1/lego/legoomni/src/actors/ambulance.cpp
index 6dbb2842..5df3963d 100644
--- a/LEGO1/lego/legoomni/src/actors/ambulance.cpp
+++ b/LEGO1/lego/legoomni/src/actors/ambulance.cpp
@@ -83,6 +83,7 @@ MxResult Ambulance::Create(MxDSAction& p_dsAction)
void Ambulance::VTable0x70(float p_float)
{
// TODO
+ IslePathActor::VTable0x70(p_float);
}
// FUNCTION: LEGO1 0x100363f0
diff --git a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
index 23b0227e..e7cdf94d 100644
--- a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
@@ -44,7 +44,6 @@
#include "legoworld.h"
#include "legoworldpresenter.h"
#include "mxcontrolpresenter.h"
-#include "mxvideopresenter.h"
#include "pizza.h"
#include "police.h"
#include "registrationbook.h"
@@ -71,6 +70,7 @@
#include "caveentity.h"
#include "jukebox.h"
#include "jukeboxentity.h"
+#include "legometerpresenter.h"
#include "mxcompositemediapresenter.h"
#include "pizzeria.h"
#include "raceskel.h"
diff --git a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
index f0df5de9..5a4435ca 100644
--- a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
@@ -46,7 +46,7 @@ void LegoMeterPresenter::ParseExtra()
extraCopy[extraLength & USHRT_MAX] = '\0';
char output[256];
- if (KeyValueStringParse(extraCopy, g_strTYPE, output)) {
+ if (KeyValueStringParse(output, g_strTYPE, extraCopy)) {
if (!strcmpi(output, g_strLEFT_TO_RIGHT)) {
m_layout = e_leftToRight;
}
@@ -61,11 +61,11 @@ void LegoMeterPresenter::ParseExtra()
}
}
- if (KeyValueStringParse(extraCopy, g_strFILLER_INDEX, output)) {
+ if (KeyValueStringParse(output, g_strFILLER_INDEX, extraCopy)) {
m_fillColor = atoi(output);
}
- if (KeyValueStringParse(extraCopy, g_strVARIABLE, output)) {
+ if (KeyValueStringParse(output, g_strVARIABLE, extraCopy)) {
m_variable = output;
}
else {
@@ -83,6 +83,7 @@ void LegoMeterPresenter::ParseExtra()
void LegoMeterPresenter::StreamingTickle()
{
MxStillPresenter::StreamingTickle();
+
m_meterPixels = new MxU8[m_frameBitmap->GetDataSize()];
if (m_meterPixels == NULL) {
assert(0);