More order

This commit is contained in:
Christian Semmler 2025-01-17 17:12:28 -07:00
parent 2af5b0a66c
commit 72bd6ccf9b
3 changed files with 22 additions and 20 deletions

View File

@ -687,7 +687,7 @@ MxResult LegoPathController::ReadBoundaries(LegoStorage* p_storage)
if (boundary.m_numTriggers > 0) { if (boundary.m_numTriggers > 0) {
boundary.m_unk0x50 = new Mx3DPointFloat; boundary.m_unk0x50 = new Mx3DPointFloat;
boundary.m_pathTrigger = new LegoWEGEdge::PathWithTrigger[boundary.m_numTriggers]; boundary.m_pathTrigger = new PathWithTrigger[boundary.m_numTriggers];
for (j = 0; j < boundary.m_numTriggers; j++) { for (j = 0; j < boundary.m_numTriggers; j++) {
if (p_storage->Read(&s, sizeof(s)) != SUCCESS) { if (p_storage->Read(&s, sizeof(s)) != SUCCESS) {

View File

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

View File

@ -1,25 +1,10 @@
#ifndef __LEGOWEGEDGE_H #ifndef __LEGOWEGEDGE_H
#define __LEGOWEGEDGE_H #define __LEGOWEGEDGE_H
#include "decomp.h"
#include "legoweedge.h"
#include "mxgeometry/mxgeometry3d.h"
#include "mxgeometry/mxgeometry4d.h"
class LegoPathStruct; class LegoPathStruct;
// might be a struct with public members // This struct might have been defined elsewhere (legopathstruct.h?).
// VTABLE: LEGO1 0x100db7f8 // Must be defined before the inclusion of Mx4DPointFloat for correct order
// SIZE 0x54
class LegoWEGEdge : public LegoWEEdge {
public:
enum {
c_bit1 = 0x01,
c_bit2 = 0x02,
c_bit3 = 0x04,
c_bit5 = 0x10
};
// SIZE 0x0c // SIZE 0x0c
struct PathWithTrigger { struct PathWithTrigger {
// FUNCTION: LEGO1 0x10048280 // FUNCTION: LEGO1 0x10048280
@ -36,6 +21,23 @@ class LegoWEGEdge : public LegoWEEdge {
float m_unk0x08; // 0x08 float m_unk0x08; // 0x08
}; };
#include "decomp.h"
#include "legoweedge.h"
#include "mxgeometry/mxgeometry3d.h"
#include "mxgeometry/mxgeometry4d.h"
// might be a struct with public members
// VTABLE: LEGO1 0x100db7f8
// SIZE 0x54
class LegoWEGEdge : public LegoWEEdge {
public:
enum {
c_bit1 = 0x01,
c_bit2 = 0x02,
c_bit3 = 0x04,
c_bit5 = 0x10
};
LegoWEGEdge(); LegoWEGEdge();
~LegoWEGEdge() override; ~LegoWEGEdge() override;