isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-27 02:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Mark Langen 2024-05-05 03:59:20 -07:00
parent fa7207cd58
commit 0ec0e8caa0
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LEGO1/lego/legoomni/include/legobuildingmanager.h
View File

@ -53,17 +53,17 @@ class LegoBuildingManager : public MxCore {
private: private:
static char* g_customizeAnimFile; static char* g_customizeAnimFile;
MxU8 m_nextVariant; // 0x08 MxU8 m_nextVariant; // 0x08
MxU8 m_unk1; MxU8 m_unk1;
void* m_pSomething; void* m_pSomething;
undefined4 m_unk2; // 0x10 undefined4 m_unk2; // 0x10
undefined4 m_unk3; undefined4 m_unk3;
undefined4 m_unk4; undefined4 m_unk4;
undefined4 m_unk5; undefined4 m_unk5;
MxU8 m_unk6; // 0x20 MxU8 m_unk6; // 0x20
undefined4 m_unk7; // 0x24 undefined4 m_unk7; // 0x24
MxU8 m_unk8; MxU8 m_unk8;
undefined4 m_unk9; // 0x2c undefined4 m_unk9; // 0x2c
}; };
#endif // LEGOBUILDINGMANAGER_H #endif // LEGOBUILDINGMANAGER_H

28
LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
View File

@ -1,7 +1,6 @@
#include "legobuildingmanager.h" #include "legobuildingmanager.h"
#include "legoentity.h" #include "legoentity.h"
#include "legoworld.h" #include "legoworld.h"
#include "misc.h" #include "misc.h"
@ -32,6 +31,7 @@ const char* g_buildingDataHausName[5] = {
"haus7", "haus7",
}; };
// clang-format off
// GLOBAL: LEGO1 0x100f3428 // GLOBAL: LEGO1 0x100f3428
float g_buildingDataDownshiftScale[16] = { float g_buildingDataDownshiftScale[16] = {
0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f,
@ -47,6 +47,7 @@ MxU8 g_buildingDataDownshift[16] = {
3, 5, 5, 5, 3, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5,
}; };
// clang-format on
// GLOBAL: LEGO1 0x100f3478 // GLOBAL: LEGO1 0x100f3478
LegoBuildingData g_buildingDataTemplate[16]; LegoBuildingData g_buildingDataTemplate[16];
@ -107,15 +108,16 @@ void LegoBuildingManager::FUN_1002fa00()
UpdatePosition(i, world); UpdatePosition(i, world);
} }
if (g_buildingManagerConfig <= 1) { if (g_buildingManagerConfig <= 1) {
LegoEntity* entity = (LegoEntity*)world->Find("MxEntity", g_buildingDataHausName[0]); LegoEntity* entity = (LegoEntity*) world->Find("MxEntity", g_buildingDataHausName[0]);
if (entity) { if (entity) {
entity->GetROI()->SetVisibility(TRUE); entity->GetROI()->SetVisibility(TRUE);
m_unk1 = 0; m_unk1 = 0;
return; return;
} }
} else { }
else {
for (i = 0; i < _countof(g_buildingDataHausName); i++) { for (i = 0; i < _countof(g_buildingDataHausName); i++) {
LegoEntity* entity = (LegoEntity*)world->Find("MxEntity", g_buildingDataHausName[i]); LegoEntity* entity = (LegoEntity*) world->Find("MxEntity", g_buildingDataHausName[i]);
if (entity) if (entity)
entity->GetROI()->SetVisibility(m_nextVariant == i); entity->GetROI()->SetVisibility(m_nextVariant == i);
} }
@ -126,8 +128,7 @@ void LegoBuildingManager::FUN_1002fa00()
// FUNCTION: LEGO1 0x1002fa90 // FUNCTION: LEGO1 0x1002fa90
void LegoBuildingManager::UpdatePosition(int p_index, LegoWorld* p_world) void LegoBuildingManager::UpdatePosition(int p_index, LegoWorld* p_world)
{ {
LegoEntity* entity = (LegoEntity*)p_world->Find( LegoEntity* entity = (LegoEntity*) p_world->Find("MxEntity", g_buildingData[p_index].m_hausName);
"MxEntity", g_buildingData[p_index].m_hausName);
if (entity) { if (entity) {
entity->SetType(3); entity->SetType(3);
g_buildingData[p_index].m_pEntity = entity; g_buildingData[p_index].m_pEntity = entity;
@ -209,17 +210,18 @@ void LegoBuildingManager::AdjustHeight(int p_i)
MxS8 value = g_buildingData[p_i].m_byte2; MxS8 value = g_buildingData[p_i].m_byte2;
if (value > 0) { if (value > 0) {
g_buildingData[p_i].m_float = g_buildingDataTemplate[p_i].m_float - g_buildingData[p_i].m_float = g_buildingDataTemplate[p_i].m_float -
(g_buildingDataDownshift[p_i] - value) * g_buildingDataDownshiftScale[p_i]; (g_buildingDataDownshift[p_i] - value) * g_buildingDataDownshiftScale[p_i];
} else if (value == 0) { }
g_buildingData[p_i].m_float = g_buildingDataTemplate[p_i].m_float - else if (value == 0) {
g_buildingDataDownshift[p_i] * g_buildingDataDownshiftScale[p_i]; g_buildingData[p_i].m_float =
if (g_buildingData[p_i].m_pEntity != NULL) g_buildingDataTemplate[p_i].m_float - g_buildingDataDownshift[p_i] * g_buildingDataDownshiftScale[p_i];
{ if (g_buildingData[p_i].m_pEntity != NULL) {
LegoROI* roi = g_buildingData[p_i].m_pEntity->GetROI(); LegoROI* roi = g_buildingData[p_i].m_pEntity->GetROI();
if (roi != NULL) if (roi != NULL)
roi->SetVisibility(FALSE); roi->SetVisibility(FALSE);
} }
} else { }
else {
g_buildingData[p_i].m_float = g_buildingDataTemplate[p_i].m_float; g_buildingData[p_i].m_float = g_buildingDataTemplate[p_i].m_float;
} }
} }