From c4a7cbc0e716e1e1b1860f4e341c79126dac6c67 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 2 Jul 2023 12:47:34 +0200 Subject: [PATCH] style fixes --- LEGO1/legobackgroundcolor.cpp | 24 ++++++++++++------------ LEGO1/legobackgroundcolor.h | 8 +++++--- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/LEGO1/legobackgroundcolor.cpp b/LEGO1/legobackgroundcolor.cpp index dc4e9596..1b81949a 100644 --- a/LEGO1/legobackgroundcolor.cpp +++ b/LEGO1/legobackgroundcolor.cpp @@ -4,40 +4,40 @@ #include "legoutil.h" #include "legovideomanager.h" -const char *Delimiter = "\t"; +const char *delimiter = "\t"; const char *set = "set"; const char *reset = "reset"; // OFFSET: LEGO1 0x1003bfb0 -LegoBackgroundColor::LegoBackgroundColor(const char *name, const char *colorString) +LegoBackgroundColor::LegoBackgroundColor(const char *p_name, const char *p_colorString) { - m_name = name; + m_name = p_name; m_name.ToUpperCase(); - SetColorString(colorString); + SetColorString(p_colorString); } // OFFSET: LEGO1 0x1003c070 -void LegoBackgroundColor::SetColorString(const char *colorString) +void LegoBackgroundColor::SetColorString(const char *p_colorString) { - m_string = colorString; + m_string = p_colorString; m_string.ToLowerCase(); LegoVideoManager *videomanager = VideoManager(); - if (!videomanager || !colorString) + if (!videomanager || !p_colorString) return; float converted_r, converted_g, converted_b; - char *colorStringCopy = strcpy(new char[strlen(colorString) + 1], colorString); - char *colorStringSplit = strtok(colorStringCopy, Delimiter); + char *colorStringCopy = strcpy(new char[strlen(p_colorString) + 1], p_colorString); + char *colorStringSplit = strtok(colorStringCopy, delimiter); if (!strcmp(colorStringSplit, set)) { - colorStringSplit = strtok(0, Delimiter); + colorStringSplit = strtok(0, delimiter); if (colorStringSplit) h = (float) (atoi(colorStringSplit) * 0.01); - colorStringSplit = strtok(0, Delimiter); + colorStringSplit = strtok(0, delimiter); if (colorStringSplit) s = (float) (atoi(colorStringSplit) * 0.01); - colorStringSplit = strtok(0, Delimiter); + colorStringSplit = strtok(0, delimiter); if (colorStringSplit) v = (float) (atoi(colorStringSplit) * 0.01); diff --git a/LEGO1/legobackgroundcolor.h b/LEGO1/legobackgroundcolor.h index 1daa6311..911ed28a 100644 --- a/LEGO1/legobackgroundcolor.h +++ b/LEGO1/legobackgroundcolor.h @@ -1,5 +1,6 @@ #ifndef LEGOBACKGROUNDCOLOR_H #define LEGOBACKGROUNDCOLOR_H + #include "mxstring.h" #include "mxcore.h" #include "mxstringvariable.h" @@ -7,9 +8,10 @@ class LegoBackgroundColor : public MxStringVariable { public: - __declspec(dllexport) LegoBackgroundColor(const char *, const char *); - void SetColorString(const char *colorString); -protected: + __declspec(dllexport) LegoBackgroundColor(const char *p_name, const char *p_colorString); + void SetColorString(const char *p_colorString); + +private: float h; float s; float v;