diff --git a/LEGO1/legobackgroundcolor.cpp b/LEGO1/legobackgroundcolor.cpp index 6a9f6a22..95dfbc3d 100644 --- a/LEGO1/legobackgroundcolor.cpp +++ b/LEGO1/legobackgroundcolor.cpp @@ -17,7 +17,7 @@ LegoBackgroundColor::LegoBackgroundColor(const char *name, const char *colorStri void LegoBackgroundColor::SetColorString(const char *colorString) { m_name = colorString; - m_colorString.ToLowerCase(); + m_string.ToLowerCase(); float converted_r; float converted_b; diff --git a/LEGO1/mxstringvariable.cpp b/LEGO1/mxstringvariable.cpp index 4593e303..a9432679 100644 --- a/LEGO1/mxstringvariable.cpp +++ b/LEGO1/mxstringvariable.cpp @@ -1,22 +1,23 @@ #include "MxStringVariable.h" #include "mxstring.h" +//FIXME: Figure out what exactly this class is used for. It is used in LegoGameState::LegoGameState when loading the background color, and for loading the "fsmovie" variable // OFFSET: LEGO1 0x1003bec0 MxStringVariable::~MxStringVariable() { - delete &m_colorString; + delete &m_string; delete &m_name; } // OFFSET: LEGO1 0x1003bea0 -MxString *MxStringVariable::GetColorString() +MxString *MxStringVariable::GetString() { - return &m_colorString; + return &m_string; } // OFFSET: LEGO1 0x1003beb0 -void MxStringVariable::SetColorString(const char *colorString) +void MxStringVariable::SetString(const char *colorString) { - m_colorString = colorString; + m_string = colorString; } diff --git a/LEGO1/mxstringvariable.h b/LEGO1/mxstringvariable.h index cd9f7b0f..5284fc5d 100644 --- a/LEGO1/mxstringvariable.h +++ b/LEGO1/mxstringvariable.h @@ -8,13 +8,13 @@ class MxStringVariable public: __declspec(dllexport) MxStringVariable(const char *, const char *); MxStringVariable() {} - virtual MxString *GetColorString(); - virtual void SetColorString(const char *colorString); + virtual MxString *GetString(); + virtual void SetString(const char *colorString); virtual ~MxStringVariable(); protected: MxString m_name; - MxString m_colorString; + MxString m_string; }; #endif // MXSTRINGVARIABLE_H