Matches

foxtacles · foxtacles · commit 2229b75a3e47 · 2026-05-04T08:39:10.000-07:00
diff --git a/GolDP/include/boundingshape0x2c.h b/GolDP/include/boundingshape0x2c.h
@@ -6,22 +6,23 @@
 #include "types.h"
 
 // VTABLE: GOLDP 0x10056b74
-// SIZE: 0x1fc
+// SIZE 0x1fc
 class BdbTxtParser : public GolTxtParser {};
 
 // VTABLE: GOLDP 0x10056b68
 // SIZE 0x2c
 class BoundingShape0x2c {
 public:
-	// SIZE: 0x20
+	// SIZE 0x20
 	struct StructField0x08 {
 		enum {
+			c_invalidIndex = 0xffff,
 			e_type0 = 0,
 			e_type1 = 1,
 		};
 
 		LegoU16 m_type;
-		LegoS16 m_unk0x02;
+		LegoU16 m_unk0x02;
 		union {
 			struct {
 				LegoFloat m_unk0x00;
@@ -30,8 +31,8 @@ class BoundingShape0x2c {
 				LegoFloat m_unk0x0c;
 				undefined4 m_unk0x10;
 				undefined4 m_unk0x14;
-				LegoS16 m_unk0x18;
-				LegoS16 m_unk0x1a;
+				LegoU16 m_unk0x18;
+				LegoU16 m_unk0x1a;
 			} t0;
 			struct {
 				undefined4 m_unk0x00;
@@ -46,7 +47,7 @@ class BoundingShape0x2c {
 			} t1;
 		} m_unk0x04;
 	};
-	// SIZE: 0x18
+	// SIZE 0x18
 	struct StructField0x18 {
 		LegoFloat m_unk0x00;
 		LegoFloat m_unk0x04;
diff --git a/GolDP/src/boundingshape0x2c.cpp b/GolDP/src/boundingshape0x2c.cpp
@@ -3,6 +3,11 @@
 #include "golbinparser.h"
 #include "golerror.h"
 
+DECOMP_SIZE_ASSERT(BdbTxtParser, 0x1fc)
+DECOMP_SIZE_ASSERT(BoundingShape0x2c::StructField0x08, 0x20)
+DECOMP_SIZE_ASSERT(BoundingShape0x2c::StructField0x18, 0x18)
+DECOMP_SIZE_ASSERT(BoundingShape0x2c, 0x2c)
+
 // FUNCTION: GOLDP 0x1001adc0
 BoundingShape0x2c::BoundingShape0x2c()
 {
@@ -32,6 +37,7 @@ void BoundingShape0x2c::Deserialize(const LegoChar* p_path, LegoBool32 p_binary)
 	if (m_unk0x08 != NULL) {
 		Destroy();
 	}
+
 	GolFileParser* parser;
 	if (p_binary) {
 		parser = new GolBinParser;
@@ -47,6 +53,7 @@ void BoundingShape0x2c::Deserialize(const LegoChar* p_path, LegoBool32 p_binary)
 		}
 	}
 	parser->OpenFileForRead(p_path);
+
 	GolFileParser::ParserTokenType token;
 
 	while ((token = parser->GetNextToken()) != 0) {
@@ -62,20 +69,24 @@ void BoundingShape0x2c::Deserialize(const LegoChar* p_path, LegoBool32 p_binary)
 			if (m_unk0x1c == 0) {
 				parser->HandleUnexpectedToken(GolFileParser::ParserTokenType::e_int);
 			}
+
 			m_unk0x20 = new LegoS16[m_unk0x1c];
 			if (m_unk0x20 == NULL) {
 				GOL_FATALERROR(c_golErrorOutOfMemory);
 			}
+
 			for (i = 0; i < m_unk0x1c; i++) {
 				m_unk0x20[i] = parser->ReadInteger();
 			}
+
 			parser->ReadRightCurly();
 			break;
 		default:
 			parser->HandleUnexpectedToken(GolFileParser::ParserTokenType::e_syntaxerror);
 			break;
 		}
 	}
+
 	parser->Dispose();
 	delete parser;
 }
@@ -84,57 +95,67 @@ void BoundingShape0x2c::Deserialize(const LegoChar* p_path, LegoBool32 p_binary)
 void BoundingShape0x2c::FUN_1001b010(GolFileParser& p_parser)
 {
 	LegoU32 i;
+
 	m_unk0x04 = p_parser.FUN_100327e0();
 	if (m_unk0x04 == 0) {
 		p_parser.HandleUnexpectedToken(GolFileParser::ParserTokenType::e_int);
 	}
+
 	m_unk0x0c = m_unk0x08 = new StructField0x08[m_unk0x04];
 	if (m_unk0x08 == NULL) {
 		GOL_FATALERROR(c_golErrorOutOfMemory);
 	}
+
 	for (i = 0; i < m_unk0x04; i++) {
 		GolFileParser::ParserTokenType type = p_parser.GetNextToken();
 		StructField0x08* obj = &m_unk0x08[i];
+
 		if (type == GolFileParser::e_unknown0x28) {
 			obj->m_type = StructField0x08::e_type0;
 			obj->m_unk0x04.t0.m_unk0x10 = 0;
 			obj->m_unk0x04.t0.m_unk0x14 = 0;
+
 			if (p_parser.ReadInteger() < 0) {
-				obj->m_unk0x02 = -1;
+				obj->m_unk0x02 = StructField0x08::c_invalidIndex;
 				m_unk0x0c = obj;
 			}
 			else {
 				obj->m_unk0x02 = p_parser.GetUnk0x38();
 			}
+
 			if (p_parser.ReadInteger() < 0) {
-				obj->m_unk0x04.t0.m_unk0x18 = -1;
+				obj->m_unk0x04.t0.m_unk0x18 = StructField0x08::c_invalidIndex;
 			}
 			else {
 				obj->m_unk0x04.t0.m_unk0x18 = p_parser.GetUnk0x38();
 			}
+
 			if (p_parser.ReadInteger() < 0) {
-				obj->m_unk0x04.t0.m_unk0x1a = -1;
-				if (obj->m_unk0x04.t0.m_unk0x18 == -1) {
+				obj->m_unk0x04.t0.m_unk0x1a = StructField0x08::c_invalidIndex;
+				if (obj->m_unk0x04.t0.m_unk0x18 == StructField0x08::c_invalidIndex) {
 					p_parser.HandleUnexpectedToken(GolFileParser::e_unsuported);
 				}
 			}
 			else {
 				obj->m_unk0x04.t0.m_unk0x1a = p_parser.GetUnk0x38();
 			}
+
 			obj->m_unk0x04.t0.m_unk0x00 = p_parser.ReadFloat();
 			obj->m_unk0x04.t0.m_unk0x04 = p_parser.ReadFloat();
 			obj->m_unk0x04.t0.m_unk0x08 = p_parser.ReadFloat();
 			obj->m_unk0x04.t0.m_unk0x0c = p_parser.ReadFloat();
 		}
 		else if (type == GolFileParser::e_unknown0x29) {
 			obj->m_type = StructField0x08::e_type1;
+
 			if (p_parser.ReadInteger() < 0) {
-				obj->m_unk0x02 = -1;
+				obj->m_unk0x02 = StructField0x08::c_invalidIndex;
 				m_unk0x0c = obj;
 			}
 			else {
 				obj->m_unk0x02 = p_parser.GetUnk0x38();
 			}
+
 			obj->m_unk0x04.t1.m_unk0x00 = p_parser.ReadInteger();
 			obj->m_unk0x04.t1.m_unk0x04 = p_parser.ReadInteger();
 			obj->m_unk0x04.t1.m_unk0x18 = p_parser.ReadInteger();
@@ -145,21 +166,25 @@ void BoundingShape0x2c::FUN_1001b010(GolFileParser& p_parser)
 			p_parser.HandleUnexpectedToken(GolFileParser::e_syntaxerror);
 		}
 	}
+
 	p_parser.ReadRightCurly();
 }
 
 // FUNCTION: GOLDP 0x1001b1a0
 void BoundingShape0x2c::FUN_1001b1a0(GolFileParser& p_parser)
 {
 	LegoS32 i;
+
 	m_unk0x14 = p_parser.FUN_100327e0();
 	if (m_unk0x14 == 0) {
 		p_parser.HandleUnexpectedToken(GolFileParser::ParserTokenType::e_int);
 	}
+
 	m_unk0x18 = new StructField0x18[m_unk0x14];
 	if (m_unk0x18 == NULL) {
 		GOL_FATALERROR(c_golErrorOutOfMemory);
 	}
+
 	for (i = 0; i < m_unk0x14; i++) {
 		m_unk0x18[i].m_unk0x00 = p_parser.ReadFloat();
 		m_unk0x18[i].m_unk0x04 = p_parser.ReadFloat();
@@ -168,6 +193,7 @@ void BoundingShape0x2c::FUN_1001b1a0(GolFileParser& p_parser)
 		m_unk0x18[i].m_unk0x10 = p_parser.ReadFloat();
 		m_unk0x18[i].m_unk0x14 = p_parser.ReadFloat();
 	}
+
 	p_parser.ReadRightCurly();
 }
 
@@ -176,20 +202,26 @@ void BoundingShape0x2c::Destroy()
 {
 	m_unk0x04 = 0;
 	m_unk0x10 = 0;
+
 	if (m_unk0x08 != NULL) {
 		delete[] m_unk0x08;
 		m_unk0x08 = NULL;
 	}
+
 	m_unk0x14 = 0;
+
 	if (m_unk0x18 != NULL) {
 		delete[] m_unk0x18;
 		m_unk0x18 = NULL;
 	}
+
 	m_unk0x1c = 0;
+
 	if (m_unk0x20 != NULL) {
 		delete[] m_unk0x20;
 		m_unk0x20 = NULL;
 	}
+
 	m_unk0x24 = 0;
 	m_unk0x28 = 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,11 @@`
`3`	`3`	`#include "golbinparser.h"`
`4`	`4`	`#include "golerror.h"`
`5`	`5`
	`6`	`+DECOMP_SIZE_ASSERT(BdbTxtParser, 0x1fc)`
	`7`	`+DECOMP_SIZE_ASSERT(BoundingShape0x2c::StructField0x08, 0x20)`
	`8`	`+DECOMP_SIZE_ASSERT(BoundingShape0x2c::StructField0x18, 0x18)`
	`9`	`+DECOMP_SIZE_ASSERT(BoundingShape0x2c, 0x2c)`
	`10`	`+`
`6`	`11`	`// FUNCTION: GOLDP 0x1001adc0`
`7`	`12`	`BoundingShape0x2c::BoundingShape0x2c()`
`8`	`13`	`{`
`@@ -32,6 +37,7 @@ void BoundingShape0x2c::Deserialize(const LegoChar* p_path, LegoBool32 p_binary)`
`32`	`37`	`if (m_unk0x08 != NULL) {`
`33`	`38`	`Destroy();`
`34`	`39`	`}`
	`40`	`+`
`35`	`41`	`GolFileParser* parser;`
`36`	`42`	`if (p_binary) {`
`37`	`43`	`parser = new GolBinParser;`
`@@ -47,6 +53,7 @@ void BoundingShape0x2c::Deserialize(const LegoChar* p_path, LegoBool32 p_binary)`
`47`	`53`	`}`
`48`	`54`	`}`
`49`	`55`	`parser->OpenFileForRead(p_path);`
	`56`	`+`
`50`	`57`	`GolFileParser::ParserTokenType token;`
`51`	`58`
`52`	`59`	`while ((token = parser->GetNextToken()) != 0) {`
`@@ -62,20 +69,24 @@ void BoundingShape0x2c::Deserialize(const LegoChar* p_path, LegoBool32 p_binary)`
`62`	`69`	`if (m_unk0x1c == 0) {`
`63`	`70`	`parser->HandleUnexpectedToken(GolFileParser::ParserTokenType::e_int);`
`64`	`71`	`}`
	`72`	`+`
`65`	`73`	`m_unk0x20 = new LegoS16[m_unk0x1c];`
`66`	`74`	`if (m_unk0x20 == NULL) {`
`67`	`75`	`GOL_FATALERROR(c_golErrorOutOfMemory);`
`68`	`76`	`}`
	`77`	`+`
`69`	`78`	`for (i = 0; i < m_unk0x1c; i++) {`
`70`	`79`	`m_unk0x20[i] = parser->ReadInteger();`
`71`	`80`	`}`
	`81`	`+`
`72`	`82`	`parser->ReadRightCurly();`
`73`	`83`	`break;`
`74`	`84`	`default:`
`75`	`85`	`parser->HandleUnexpectedToken(GolFileParser::ParserTokenType::e_syntaxerror);`
`76`	`86`	`break;`
`77`	`87`	`}`
`78`	`88`	`}`
	`89`	`+`
`79`	`90`	`parser->Dispose();`
`80`	`91`	`delete parser;`
`81`	`92`	`}`
`@@ -84,57 +95,67 @@ void BoundingShape0x2c::Deserialize(const LegoChar* p_path, LegoBool32 p_binary)`
`84`	`95`	`void BoundingShape0x2c::FUN_1001b010(GolFileParser& p_parser)`
`85`	`96`	`{`
`86`	`97`	`LegoU32 i;`
	`98`	`+`
`87`	`99`	`m_unk0x04 = p_parser.FUN_100327e0();`
`88`	`100`	`if (m_unk0x04 == 0) {`
`89`	`101`	`p_parser.HandleUnexpectedToken(GolFileParser::ParserTokenType::e_int);`
`90`	`102`	`}`
	`103`	`+`
`91`	`104`	`m_unk0x0c = m_unk0x08 = new StructField0x08[m_unk0x04];`
`92`	`105`	`if (m_unk0x08 == NULL) {`
`93`	`106`	`GOL_FATALERROR(c_golErrorOutOfMemory);`
`94`	`107`	`}`
	`108`	`+`
`95`	`109`	`for (i = 0; i < m_unk0x04; i++) {`
`96`	`110`	`GolFileParser::ParserTokenType type = p_parser.GetNextToken();`
`97`	`111`	`StructField0x08* obj = &m_unk0x08[i];`
	`112`	`+`
`98`	`113`	`if (type == GolFileParser::e_unknown0x28) {`
`99`	`114`	`obj->m_type = StructField0x08::e_type0;`
`100`	`115`	`obj->m_unk0x04.t0.m_unk0x10 = 0;`
`101`	`116`	`obj->m_unk0x04.t0.m_unk0x14 = 0;`
	`117`	`+`
`102`	`118`	`if (p_parser.ReadInteger() < 0) {`
`103`		`- obj->m_unk0x02 = -1;`
	`119`	`+ obj->m_unk0x02 = StructField0x08::c_invalidIndex;`
`104`	`120`	`m_unk0x0c = obj;`
`105`	`121`	`}`
`106`	`122`	`else {`
`107`	`123`	`obj->m_unk0x02 = p_parser.GetUnk0x38();`
`108`	`124`	`}`
	`125`	`+`
`109`	`126`	`if (p_parser.ReadInteger() < 0) {`
`110`		`- obj->m_unk0x04.t0.m_unk0x18 = -1;`
	`127`	`+ obj->m_unk0x04.t0.m_unk0x18 = StructField0x08::c_invalidIndex;`
`111`	`128`	`}`
`112`	`129`	`else {`
`113`	`130`	`obj->m_unk0x04.t0.m_unk0x18 = p_parser.GetUnk0x38();`
`114`	`131`	`}`
	`132`	`+`
`115`	`133`	`if (p_parser.ReadInteger() < 0) {`
`116`		`- obj->m_unk0x04.t0.m_unk0x1a = -1;`
`117`		`- if (obj->m_unk0x04.t0.m_unk0x18 == -1) {`
	`134`	`+ obj->m_unk0x04.t0.m_unk0x1a = StructField0x08::c_invalidIndex;`
	`135`	`+ if (obj->m_unk0x04.t0.m_unk0x18 == StructField0x08::c_invalidIndex) {`
`118`	`136`	`p_parser.HandleUnexpectedToken(GolFileParser::e_unsuported);`
`119`	`137`	`}`
`120`	`138`	`}`
`121`	`139`	`else {`
`122`	`140`	`obj->m_unk0x04.t0.m_unk0x1a = p_parser.GetUnk0x38();`
`123`	`141`	`}`
	`142`	`+`
`124`	`143`	`obj->m_unk0x04.t0.m_unk0x00 = p_parser.ReadFloat();`
`125`	`144`	`obj->m_unk0x04.t0.m_unk0x04 = p_parser.ReadFloat();`
`126`	`145`	`obj->m_unk0x04.t0.m_unk0x08 = p_parser.ReadFloat();`
`127`	`146`	`obj->m_unk0x04.t0.m_unk0x0c = p_parser.ReadFloat();`
`128`	`147`	`}`
`129`	`148`	`else if (type == GolFileParser::e_unknown0x29) {`
`130`	`149`	`obj->m_type = StructField0x08::e_type1;`
	`150`	`+`
`131`	`151`	`if (p_parser.ReadInteger() < 0) {`
`132`		`- obj->m_unk0x02 = -1;`
	`152`	`+ obj->m_unk0x02 = StructField0x08::c_invalidIndex;`
`133`	`153`	`m_unk0x0c = obj;`
`134`	`154`	`}`
`135`	`155`	`else {`
`136`	`156`	`obj->m_unk0x02 = p_parser.GetUnk0x38();`
`137`	`157`	`}`
	`158`	`+`
`138`	`159`	`obj->m_unk0x04.t1.m_unk0x00 = p_parser.ReadInteger();`
`139`	`160`	`obj->m_unk0x04.t1.m_unk0x04 = p_parser.ReadInteger();`
`140`	`161`	`obj->m_unk0x04.t1.m_unk0x18 = p_parser.ReadInteger();`
`@@ -145,21 +166,25 @@ void BoundingShape0x2c::FUN_1001b010(GolFileParser& p_parser)`
`145`	`166`	`p_parser.HandleUnexpectedToken(GolFileParser::e_syntaxerror);`
`146`	`167`	`}`
`147`	`168`	`}`
	`169`	`+`
`148`	`170`	`p_parser.ReadRightCurly();`
`149`	`171`	`}`
`150`	`172`
`151`	`173`	`// FUNCTION: GOLDP 0x1001b1a0`
`152`	`174`	`void BoundingShape0x2c::FUN_1001b1a0(GolFileParser& p_parser)`
`153`	`175`	`{`
`154`	`176`	`LegoS32 i;`
	`177`	`+`
`155`	`178`	`m_unk0x14 = p_parser.FUN_100327e0();`
`156`	`179`	`if (m_unk0x14 == 0) {`
`157`	`180`	`p_parser.HandleUnexpectedToken(GolFileParser::ParserTokenType::e_int);`
`158`	`181`	`}`
	`182`	`+`
`159`	`183`	`m_unk0x18 = new StructField0x18[m_unk0x14];`
`160`	`184`	`if (m_unk0x18 == NULL) {`
`161`	`185`	`GOL_FATALERROR(c_golErrorOutOfMemory);`
`162`	`186`	`}`
	`187`	`+`
`163`	`188`	`for (i = 0; i < m_unk0x14; i++) {`
`164`	`189`	`m_unk0x18[i].m_unk0x00 = p_parser.ReadFloat();`
`165`	`190`	`m_unk0x18[i].m_unk0x04 = p_parser.ReadFloat();`
`@@ -168,6 +193,7 @@ void BoundingShape0x2c::FUN_1001b1a0(GolFileParser& p_parser)`
`168`	`193`	`m_unk0x18[i].m_unk0x10 = p_parser.ReadFloat();`
`169`	`194`	`m_unk0x18[i].m_unk0x14 = p_parser.ReadFloat();`
`170`	`195`	`}`
	`196`	`+`
`171`	`197`	`p_parser.ReadRightCurly();`
`172`	`198`	`}`
`173`	`199`
`@@ -176,20 +202,26 @@ void BoundingShape0x2c::Destroy()`
`176`	`202`	`{`
`177`	`203`	`m_unk0x04 = 0;`
`178`	`204`	`m_unk0x10 = 0;`
	`205`	`+`
`179`	`206`	`if (m_unk0x08 != NULL) {`
`180`	`207`	`delete[] m_unk0x08;`
`181`	`208`	`m_unk0x08 = NULL;`
`182`	`209`	`}`
	`210`	`+`
`183`	`211`	`m_unk0x14 = 0;`
	`212`	`+`
`184`	`213`	`if (m_unk0x18 != NULL) {`
`185`	`214`	`delete[] m_unk0x18;`
`186`	`215`	`m_unk0x18 = NULL;`
`187`	`216`	`}`
	`217`	`+`
`188`	`218`	`m_unk0x1c = 0;`
	`219`	`+`
`189`	`220`	`if (m_unk0x20 != NULL) {`
`190`	`221`	`delete[] m_unk0x20;`
`191`	`222`	`m_unk0x20 = NULL;`
`192`	`223`	`}`
	`224`	`+`
`193`	`225`	`m_unk0x24 = 0;`
`194`	`226`	`m_unk0x28 = 0;`
`195`	`227`	`}`