Fix SDD / style

Author: foxtacles

GolDP/src/fluffygloomkins0x118.cpp

@@ -145,7 +145,7 @@ undefined4* FluffyGloomkins0x118::VTable0x08()
 
 	if (GetUnk0x1c() != 0) {
 		m_unk0x10c = new CmbModelPart0x34[GetUnk0x1c()];
-		if (m_unk0xf4 == NULL) {
+		if (m_unk0x10c == NULL) {
 			GOL_FATALERROR(c_golErrorOutOfMemory);
 		}
 	}

LEGORacers/include/aquamarinespirit0x3c.h

@@ -1,7 +1,7 @@
 #ifndef AQUAMARINESPIRIT0X3C_H
 #define AQUAMARINESPIRIT0X3C_H
 
-#include "../../common/include/cmbmodelpart0x34.h"
+#include "cmbmodelpart0x34.h"
 #include "decomp.h"
 #include "golnametable.h"
 #include "goltxtparser.h"

common/include/cmbmodelpart0x34.h

@@ -8,38 +8,35 @@
 #include "types.h"
 
 class GolFileParser;
-
-class CmbModelPartData0x14;
 class CmbModelPartData0x28;
 
-// VTABLE: GOLDP 0x10056a68
-// VTABLE: LEGORACERS 0x004af23c
-// SIZE 0x1fc
-class AdbTxtParser : public GolTxtParser {
-
-	// SYNTHETIC: GOLDP 0x10030050 FOLDED
-	// SYNTHETIC: LEGORACERS 0x0041e920 FOLDED
-	// AdbTxtParser::`scalar deleting destructor'
-
-	// SYNTHETIC: GOLDP 0x1001b000 FOLDED
-	// SYNTHETIC: LEGORACERS 0x0041e93b FOLDED
-	// AdbTxtParser::~AdbTxtParser
-};
-
-// SIZE 0x14
-struct CmbModelPartData0x14 {
-	LegoU32 m_unk0x00;
-	LegoU32 m_unk0x04;
-	LegoU32 m_unk0x08;
-	LegoU32 m_unk0x0c;
-	LegoU16 m_unk0x10;
-	LegoU16 m_unk0x12;
-};
-
 // VTABLE: GOLDP 0x10056a50
 // VTABLE: LEGORACERS 0x004af224
 // SIZE 0x34
 class CmbModelPart0x34 : public GolNameTable {
+	// VTABLE: GOLDP 0x10056a68
+	// VTABLE: LEGORACERS 0x004af23c
+	// SIZE 0x1fc
+	class AdbTxtParser : public GolTxtParser {
+		// SYNTHETIC: GOLDP 0x10030050 FOLDED
+		// SYNTHETIC: LEGORACERS 0x0041e920 FOLDED
+		// CmbModelPart0x34::AdbTxtParser::`scalar deleting destructor'
+
+		// SYNTHETIC: GOLDP 0x1001b000 FOLDED
+		// SYNTHETIC: LEGORACERS 0x00498840 FOLDED
+		// CmbModelPart0x34::AdbTxtParser::~AdbTxtParser
+	};
+
+	// SIZE 0x14
+	struct Data0x14 {
+		LegoU32 m_unk0x00; // 0x00
+		LegoU32 m_unk0x04; // 0x04
+		LegoU32 m_unk0x08; // 0x08
+		LegoU32 m_unk0x0c; // 0x0c
+		LegoU16 m_unk0x10; // 0x10
+		LegoU16 m_unk0x12; // 0x12
+	};
+
 public:
 	CmbModelPart0x34();
 	~CmbModelPart0x34() override;                                         // vtable+0x00
@@ -54,7 +51,7 @@ class CmbModelPart0x34 : public GolNameTable {
 
 private:
 	CmbModelPartData0x18 m_data;     // 0x0c
-	CmbModelPartData0x14* m_unk0x24; // 0x24
+	Data0x14* m_unk0x24;             // 0x24
 	LegoU32 m_unk0x28;               // 0x28
 	CmbModelPartData0x28* m_unk0x2c; // 0x2c
 	LegoU32 m_unk0x30;               // 0x30

common/include/cmbmodelpartdata0x28.h

@@ -14,12 +14,12 @@ class CmbModelPartData0x28 {
 	void FUN_10018670(GolFileParser& p_parser);
 
 private:
-	LegoFloat m_unk0x00;                // 0x00
-	GolVec3 m_unk0x04;                  // 0x04
-	GolVec4 m_unk0x10; /* or GolQuat */ // 0x10
-	LegoU32 m_unk0x20;                  // 0x20
-	LegoU16 m_unk0x24;                  // 0x24
-	LegoU16 m_unk0x26;                  // 0x26
+	LegoFloat m_unk0x00; // 0x00
+	GolVec3 m_unk0x04;   // 0x04
+	GolVec4 m_unk0x10;   // 0x10
+	LegoU32 m_unk0x20;   // 0x20
+	LegoU16 m_unk0x24;   // 0x24
+	LegoU16 m_unk0x26;   // 0x26
 };
 
 #endif // CMBMODELPARTDATA0X28_H

common/src/cmbmodelpart0x34.cpp

@@ -1,8 +1,8 @@
-#include "../include/cmbmodelpart0x34.h"
+#include "cmbmodelpart0x34.h"
 
-#include "../include/cmbmodelpartdata0x28.h"
-#include "../include/golbinparser.h"
-#include "../include/golerror.h"
+#include "cmbmodelpartdata0x28.h"
+#include "golbinparser.h"
+#include "golerror.h"
 
 DECOMP_SIZE_ASSERT(CmbModelPart0x34, 0x34)
 
@@ -97,7 +97,7 @@ void CmbModelPart0x34::VTable0x0c(GolFileParser& p_parser)
 	if (m_unk0x28 == 0) {
 		p_parser.HandleUnexpectedToken(GolFileParser::e_int);
 	}
-	m_unk0x24 = new CmbModelPartData0x14[m_unk0x28];
+	m_unk0x24 = new Data0x14[m_unk0x28];
 	if (m_unk0x24 == NULL) {
 		GOL_FATALERROR(c_golErrorOutOfMemory);
 	}

common/src/cmbmodelpartdata0x18.cpp

@@ -1,7 +1,7 @@
-#include "../include/cmbmodelpartdata0x18.h"
+#include "cmbmodelpartdata0x18.h"
 
-#include "../include/golerror.h"
-#include "../include/golfileparser.h"
+#include "golerror.h"
+#include "golfileparser.h"
 
 DECOMP_SIZE_ASSERT(CmbModelPartData0x18, 0x18)
 

common/src/cmbmodelpartdata0x28.cpp

@@ -1,15 +1,15 @@
-#include "../include/cmbmodelpartdata0x28.h"
+#include "cmbmodelpartdata0x28.h"
+
+#include "golfileparser.h"
 
-#include <../include/golfileparser.h>
 #include <float.h>
 
-DECOMP_SIZE_ASSERT(CmbModelPartData0x28, 0x28);
+DECOMP_SIZE_ASSERT(CmbModelPartData0x28, 0x28)
 
 // FUNCTION: GOLDP 0x10018640
 // FUNCTION: LEGORACERS 0x00401000
 CmbModelPartData0x28::CmbModelPartData0x28()
 {
-
 	m_unk0x24 = 0;
 	m_unk0x26 = 0;
 	m_unk0x20 = 0;
@@ -49,7 +49,6 @@ void CmbModelPartData0x28::FUN_10018670(GolFileParser& p_parser)
 			break;
 		case GolFileParser::e_unknown0x2f:
 			m_unk0x00 = static_cast<LegoFloat>(p_parser.ReadInteger()) / 1000.0f;
-			;
 			break;
 		case GolFileParser::e_unknown0x30:
 			m_unk0x04.m_x = p_parser.ReadFloat();