From c2b05b659b6eabdf81ab8d30e47d21800de9dfa2 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Sat, 3 Feb 2024 00:19:41 +0100 Subject: [PATCH] Fix naming --- LEGO1/lego/legoomni/include/act1state.h | 2 +- LEGO1/lego/legoomni/src/act1/act1state.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h index f8e964fd..5a39c9b3 100644 --- a/LEGO1/lego/legoomni/include/act1state.h +++ b/LEGO1/lego/legoomni/include/act1state.h @@ -48,7 +48,7 @@ class Act1State : public LegoState { // FUNCTION: LEGO1 0x10033800 NamedPlane() {} - inline void SetName(const char* name) { m_name = name; } + inline void SetName(const char* p_name) { m_name = p_name; } inline const MxString* GetName() const { return &m_name; } int Serialize(LegoFile* p_file); diff --git a/LEGO1/lego/legoomni/src/act1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp index d48dace4..1fbbf78c 100644 --- a/LEGO1/lego/legoomni/src/act1/act1state.cpp +++ b/LEGO1/lego/legoomni/src/act1/act1state.cpp @@ -12,16 +12,16 @@ void WriteNamedTexture(LegoFile* p_file, Act1State::NamedTexture* p_texture); void FUN_1003f540(LegoFile* p_file, const char* p_filename); enum { - eUnk_953 = 953, - eUnk_954 = 954, - eUnk_955 = 955, + e_unk_953 = 953, + e_unk_954 = 954, + e_unk_955 = 955, }; // GLOBAL: ISLE 0x100f37f0 -int g_act1_ints[] = { - eUnk_953, - eUnk_954, - eUnk_955, +int g_unk0x100f37f0[] = { + e_unk_953, + e_unk_954, + e_unk_955, }; // STUB: LEGO1 0x100334b0 @@ -33,7 +33,7 @@ Act1State::Act1State() : m_unk0x00c(0), m_unk0x00e(0), m_unk0x008(NULL), m_unk0x m_unk0x020 = 0; m_unk0x00e = 0; m_unk0x01f = 0; - m_unk0x008 = g_act1_ints; + m_unk0x008 = g_unk0x100f37f0; m_unk0x014 = -1; m_unk0x022 = 0; m_unk0x154 = NULL; @@ -43,7 +43,7 @@ Act1State::Act1State() : m_unk0x00c(0), m_unk0x00e(0), m_unk0x008(NULL), m_unk0x m_unk0x1b0 = NULL; m_unk0x021 = 1; m_unk0x01c = 1; - m_unk0x00c = isle_asize(g_act1_ints); + m_unk0x00c = isle_asize(g_unk0x100f37f0); m_unk0x1b4 = NULL; m_unk0x1b8 = NULL; m_unk0x208 = NULL;