mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve order until legomain.cpp (#1350)

Browse Source 
* Fix `LegoBackgroundColor` order

* Order

* Improve order in Act3Actors

* Improve order

* Add BETA annotation

* Order more

* More order

* More order

* Order

* Match/order

* Remove blank line

* Modern compiler fix

* vtable annotation
This commit is contained in:
Christian Semmler
2025-01-17 18:33:27 -07:00
committed by GitHub
parent e1ce96c473
commit fc03e7a682
24 changed files with 218 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/sources/geom/legowegedge.cpp
View File

@@ -5,7 +5,7 @@
#include <assert.h>
DECOMP_SIZE_ASSERT(LegoWEGEdge, 0x54)
DECOMP_SIZE_ASSERT(LegoWEGEdge::PathWithTrigger, 0x0c)
DECOMP_SIZE_ASSERT(PathWithTrigger, 0x0c)
// FUNCTION: LEGO1 0x1009a730
// FUNCTION: BETA10 0x101830ec

39
LEGO1/lego/sources/geom/legowegedge.h
View File

@@ -1,13 +1,32 @@
#ifndef __LEGOWEGEDGE_H
#define __LEGOWEGEDGE_H
class LegoPathStruct;
#include "decomp.h"
#include "legoweedge.h"
// This struct might have been defined elsewhere (legopathstruct.h?).
// Must be defined before the inclusion of Mx4DPointFloat for correct order
// SIZE 0x0c
struct PathWithTrigger {
// FUNCTION: LEGO1 0x10048280
// FUNCTION: BETA10 0x100bd450
PathWithTrigger()
{
m_pathStruct = NULL;
m_data = 0;
m_unk0x08 = 0.0f;
}
LegoPathStruct* m_pathStruct; // 0x00
unsigned int m_data; // 0x04
float m_unk0x08; // 0x08
};
#include "mxgeometry/mxgeometry3d.h"
#include "mxgeometry/mxgeometry4d.h"
class LegoPathStruct;
// might be a struct with public members
// VTABLE: LEGO1 0x100db7f8
// SIZE 0x54
@@ -20,22 +39,6 @@ public:
c_bit5 = 0x10
};
// SIZE 0x0c
struct PathWithTrigger {
// FUNCTION: LEGO1 0x10048280
// FUNCTION: BETA10 0x100bd450
PathWithTrigger()
{
m_pathStruct = NULL;
m_data = 0;
m_unk0x08 = 0.0f;
}
LegoPathStruct* m_pathStruct; // 0x00
unsigned int m_data; // 0x04
float m_unk0x08; // 0x08
};
LegoWEGEdge();
~LegoWEGEdge() override;