diff --git a/LEGO1/lego/legoomni/include/legovariables.h b/LEGO1/lego/legoomni/include/legovariables.h index 5ed6f2cb..2116c564 100644 --- a/LEGO1/lego/legoomni/include/legovariables.h +++ b/LEGO1/lego/legoomni/include/legovariables.h @@ -4,9 +4,9 @@ #include "mxvariable.h" extern const char* g_varVISIBILITY; -extern const char* g_varCAMERA_LOCATION; +extern const char* g_varCAMERALOCATION; extern const char* g_varCURSOR; -extern const char* g_varWHO_AM_I; +extern const char* g_varWHOAMI; // VTABLE: LEGO1 0x100d86c8 // SIZE 0x24 @@ -21,7 +21,7 @@ class VisibilityVariable : public MxVariable { // SIZE 0x24 class CameraLocationVariable : public MxVariable { public: - CameraLocationVariable() { m_key = g_varCAMERA_LOCATION; } + CameraLocationVariable() { m_key = g_varCAMERALOCATION; } void SetValue(const char* p_value) override; // vtable+0x04 }; @@ -39,7 +39,7 @@ class CursorVariable : public MxVariable { // SIZE 0x24 class WhoAmIVariable : public MxVariable { public: - WhoAmIVariable() { m_key = g_varWHO_AM_I; } + WhoAmIVariable() { m_key = g_varWHOAMI; } void SetValue(const char* p_value) override; // vtable+0x04 }; diff --git a/LEGO1/lego/legoomni/src/common/legovariables.cpp b/LEGO1/lego/legoomni/src/common/legovariables.cpp index 6d78e97e..f69bfcd3 100644 --- a/LEGO1/lego/legoomni/src/common/legovariables.cpp +++ b/LEGO1/lego/legoomni/src/common/legovariables.cpp @@ -6,7 +6,7 @@ const char* g_varVISIBILITY = "VISIBILITY"; // GLOBAL: LEGO1 0x100f3a44 // STRING: LEGO1 0x100f3a30 -const char* g_varCAMERA_LOCATION = "CAMERA_LOCATION"; +const char* g_varCAMERALOCATION = "CAMERA_LOCATION"; // GLOBAL: LEGO1 0x100f3a48 // STRING: LEGO1 0x100f3a28 @@ -14,7 +14,7 @@ const char* g_varCURSOR = "CURSOR"; // GLOBAL: LEGO1 0x100f3a4c // STRING: LEGO1 0x100f3a1c -const char* g_varWHO_AM_I = "WHO_AM_I"; +const char* g_varWHOAMI = "WHO_AM_I"; // STUB: LEGO1 0x10037d00 void VisibilityVariable::SetValue(const char* p_value) diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp index ef08b212..5ef0d580 100644 --- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp @@ -103,7 +103,7 @@ MxLong ElevatorBottom::HandleClick(LegoControlManagerEvent& p_param) state->SetUnknown1c(1); m_unk0xf8 = LegoGameState::e_unk6; TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); - VariableTable()->SetVariable(g_varCAMERA_LOCATION, "LCAMZI1,90"); + VariableTable()->SetVariable(g_varCAMERALOCATION, "LCAMZI1,90"); result = 1; break; }