From 94101ebb978d59398aa056866ad845092932ac17 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 6 Apr 2024 07:31:00 -0400
Subject: [PATCH] style

---
 LEGO1/lego/legoomni/src/worlds/gasstation.cpp | 30 +++++++++++--------
 LEGO1/omni/include/mxdsobject.h               | 15 ++++------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp
index fde27c2f..d5be59ce 100644
--- a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp
@@ -125,7 +125,7 @@ void GasStation::ReadyWorld()
 	m_currentActorId = CurrentActor()->GetActorId();
 
 	switch (m_currentActorId) {
-	case 1: {
+	case 1:
 		switch (m_state->m_unk0x18) {
 		case 0:
 			m_state->m_unk0x14.m_unk0x00 = 5;
@@ -153,9 +153,10 @@ void GasStation::ReadyWorld()
 		if (m_state->m_unk0x18 < 5) {
 			m_state->m_unk0x18++;
 		}
+
+		FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 		break;
-	}
-	case 2: {
+	case 2:
 		switch (m_state->m_unk0x1a) {
 		case 0:
 			m_state->m_unk0x14.m_unk0x00 = 5;
@@ -178,9 +179,10 @@ void GasStation::ReadyWorld()
 		if (m_state->m_unk0x1a < 5) {
 			m_state->m_unk0x1a++;
 		}
+
+		FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 		break;
-	}
-	case 3: {
+	case 3:
 		switch (m_state->m_unk0x1c) {
 		case 0:
 			m_state->m_unk0x14.m_unk0x00 = 5;
@@ -203,9 +205,10 @@ void GasStation::ReadyWorld()
 		if (m_state->m_unk0x1c < 5) {
 			m_state->m_unk0x1c++;
 		}
+
+		FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 		break;
-	}
-	case 4: {
+	case 4:
 		switch (m_state->m_unk0x1e) {
 		case 0:
 			m_state->m_unk0x14.m_unk0x00 = 5;
@@ -228,9 +231,10 @@ void GasStation::ReadyWorld()
 		if (m_state->m_unk0x1e < 5) {
 			m_state->m_unk0x1e++;
 		}
+
+		FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 		break;
-	}
-	case 5: {
+	case 5:
 		switch (m_state->m_unk0x20) {
 		case 0:
 			m_state->m_unk0x14.m_unk0x00 = 5;
@@ -253,11 +257,13 @@ void GasStation::ReadyWorld()
 		if (m_state->m_unk0x20 < 5) {
 			m_state->m_unk0x20++;
 		}
+
+		FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
+		break;
+	default:
+		FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 		break;
 	}
-	}
-
-	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
 
 // FUNCTION: LEGO1 0x10005590
diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
index f141afc0..1a8c6ba2 100644
--- a/LEGO1/omni/include/mxdsobject.h
+++ b/LEGO1/omni/include/mxdsobject.h
@@ -44,9 +44,12 @@ class MxDSObject : public MxCore {
 		return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name);
 	} // vtable+10;
 
-	virtual undefined4 VTable0x14();                                                // vtable+14;
-	virtual MxU32 GetSizeOnDisk();                                                  // vtable+18;
-	virtual void Deserialize(MxU8*& p_source, MxS16 p_unk0x24);                     // vtable+1c;
+	virtual undefined4 VTable0x14();                            // vtable+14;
+	virtual MxU32 GetSizeOnDisk();                              // vtable+18;
+	virtual void Deserialize(MxU8*& p_source, MxS16 p_unk0x24); // vtable+1c;
+
+	// FUNCTION: ISLE 0x401c40
+	// FUNCTION: LEGO1 0x10005530
 	inline virtual void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } // vtable+20;
 
 	inline Type GetType() const { return (Type) this->m_type; }
@@ -81,10 +84,4 @@ class MxDSObject : public MxCore {
 
 MxDSObject* DeserializeDSObjectDispatch(MxU8*&, MxS16);
 
-// FUNCTION: ISLE 0x401c40
-// MxDSObject::SetAtomId
-
-// FUNCTION: LEGO1 0x10005530
-// MxDSObject::SetAtomId
-
 #endif // MXDSOBJECT_H