Matches

Author: foxtacles

GolDP/include/amberlens0x344.h

@@ -38,7 +38,7 @@ class AmberLens0x344 : public AmberLensBase0x120 {
 	// SYNTHETIC: GOLDP 0x10017a60
 	// AmberLens0x344::`vector deleting destructor'
 
-	JadeOrbit0x220* GetUnk0x04() { return m_unk0x04; }
+	JadeOrbit0xd0* GetUnk0x04() { return m_unk0x04; }
 
 protected:
 	friend class BronzeFalcon0xc8770;

GolDP/include/amberlensbase0x120.h

@@ -5,7 +5,7 @@
 #include "decomp.h"
 #include "types.h"
 
-class JadeOrbit0x220;
+class JadeOrbit0xd0;
 struct Rect;
 
 // VTABLE: GOLDP 0x10056cc0
@@ -28,7 +28,7 @@ class AmberLensBase0x120 {
 	// SYNTHETIC: GOLDP 0x1001bf90
 	// AmberLensBase0x120::`scalar deleting destructor'
 
-	JadeOrbit0x220* m_unk0x04;         // 0x04
+	JadeOrbit0xd0* m_unk0x04;          // 0x04
 	LegoFloat m_unk0x08;               // 0x08
 	LegoFloat m_unk0x0c;               // 0x0c
 	LegoFloat m_unk0x10;               // 0x10

GolDP/include/jadeorbit0x220.h

@@ -6,17 +6,18 @@
 #include "types.h"
 
 // SIZE 0x220
-class JadeOrbit0x220 : public JadeOrbit0xd0 {
+class JadeOrbit0x220 {
 public:
-	GolMatrix4 m_unk0xd0;  // 0xd0
-	GolMatrix4 m_unk0x110; // 0x110
-	GolMatrix4 m_unk0x150; // 0x150
-	GolMatrix4 m_unk0x190; // 0x190
-	GolMatrix4 m_unk0x1d0; // 0x1d0
-	LegoFloat m_unk0x210;  // 0x210
-	LegoFloat m_unk0x214;  // 0x214
-	LegoFloat m_unk0x218;  // 0x218
-	LegoFloat m_unk0x21c;  // 0x21c
+	JadeOrbit0xd0 m_unk0x00; // 0x00
+	GolMatrix4 m_unk0xd0;    // 0xd0
+	GolMatrix4 m_unk0x110;   // 0x110
+	GolMatrix4 m_unk0x150;   // 0x150
+	GolMatrix4 m_unk0x190;   // 0x190
+	GolMatrix4 m_unk0x1d0;   // 0x1d0
+	LegoFloat m_unk0x210;    // 0x210
+	LegoFloat m_unk0x214;    // 0x214
+	LegoFloat m_unk0x218;    // 0x218
+	LegoFloat m_unk0x21c;    // 0x21c
 };
 
 #endif // JADEORBIT0X220_H

GolDP/src/amberlens0x344.cpp

@@ -8,7 +8,7 @@ DECOMP_SIZE_ASSERT(AmberLens0x344, 0x344)
 // FUNCTION: GOLDP 0x10001ea0
 AmberLens0x344::AmberLens0x344()
 {
-	m_unk0x04 = &m_unk0x120;
+	m_unk0x04 = &m_unk0x120.m_unk0x00;
 	m_renderer = NULL;
 }
 

GolDP/src/greyfalconnode0x1c.cpp

@@ -56,15 +56,12 @@ void GreyFalconNode0x1c::FUN_10014a60(const GolMatrix4& p_m1, const GolMatrix4&
 		obj = m_unk0x18;
 		end = &m_unk0x18[m_unk0x10];
 		for (; obj < end; obj++) {
-			if (obj->m_unk0x04 != NULL) {
-				GolMath::FUN_1002f3a0(
-					obj->m_unk0x10,
-					static_cast<JadeOrbit0xd0*>(obj->m_unk0x04)->m_unk0x50,
-					&obj->m_unk0x50
-				);
+			JadeOrbit0xd0* parent = static_cast<JadeOrbit0xd0*>(obj->m_unk0x04);
+			if (parent == NULL) {
+				GolMath::FUN_1002f3a0(obj->m_unk0x10, p_m1, &obj->m_unk0x50);
 			}
 			else {
-				GolMath::FUN_1002f3a0(obj->m_unk0x10, p_m1, &obj->m_unk0x50);
+				GolMath::FUN_1002f3a0(obj->m_unk0x10, parent->m_unk0x50, &obj->m_unk0x50);
 			}
 		}
 	}