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

Address review comments

Browse Source
This commit is contained in:
jonschz 2024-11-11 08:06:13 +01:00
parent c8ed785617
commit ef0f19d529
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legocarbuildpresenter.h
View File

@ -78,7 +78,7 @@ class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
MxBool StringEqualsPlatform(const LegoChar* p_string);
MxBool StringEqualsShelf(const LegoChar* p_string);
MxBool StringEndsOnY(const LegoChar* p_string);
MxBool StringEndsOnZero(const LegoChar* p_string);
MxBool StringDoesNotEndOnZero(const LegoChar* p_string);
const LegoChar* GetWiredNameByPartName(const LegoChar* p_name);
void SetPartObjectIdByName(const LegoChar* p_name, MxS16 p_objectId);

2
LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View File

@ -1312,7 +1312,7 @@ void LegoCarBuild::TogglePresentersEnabled()
// FUNCTION: BETA10 0x1006e124
void LegoCarBuild::FUN_100250e0(MxBool p_enabled)
{
if (m_unk0x258->StringEndsOnZero(m_unk0x110->GetName()) && m_Decals_Ctl) {
if (m_unk0x258->StringDoesNotEndOnZero(m_unk0x110->GetName()) && m_Decals_Ctl) {
if (strnicmp(m_unk0x110->GetName(), "JSFRNT", strlen("JSFRNT")) == 0) {
m_Decal_Bitmap->Enable(p_enabled);
m_Decals_Ctl->Enable(p_enabled);

16
LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp
View File

@ -9,6 +9,7 @@
#include "legovideomanager.h"
#include "legoworld.h"
#include "misc.h"
#include "misc/legoutil.h"
#include "mxautolock.h"
#include "mxcompositepresenter.h"
#include "mxmisc.h"
@ -507,14 +508,6 @@ LegoTreeNode* LegoCarBuildAnimPresenter::FindNodeByName(LegoTreeNode* p_treeNode
return NULL;
}
// FUNCTION: BETA10 0x10073c20
inline void Exchange(MxS16* p_value1, MxS16* p_value2)
{
MxS16 temp = *p_value1;
*p_value1 = *p_value2;
*p_value2 = temp;
}
// FUNCTION: LEGO1 0x10079790
// FUNCTION: BETA10 0x100720a3
void LegoCarBuildAnimPresenter::FUN_10079790(const LegoChar* p_name)
@ -523,7 +516,6 @@ void LegoCarBuildAnimPresenter::FUN_10079790(const LegoChar* p_name)
LegoChar buffer[40];
if (strcmpi(m_parts[m_placedPartCount].m_name, p_name) != 0) {
// Something is still of by 1 here
for (i = m_placedPartCount + 1; i < m_numberOfParts; i++) {
if (stricmp(m_parts[i].m_name, p_name) == 0) {
break;
@ -533,12 +525,12 @@ void LegoCarBuildAnimPresenter::FUN_10079790(const LegoChar* p_name)
strcpy(buffer, m_parts[m_placedPartCount].m_name);
strcpy(m_parts[m_placedPartCount].m_name, m_parts[i].m_name);
strcpy(m_parts[i].m_name, buffer);
Exchange(&m_parts[m_placedPartCount].m_objectId, &m_parts[i].m_objectId);
Swap(m_parts[m_placedPartCount].m_objectId, m_parts[i].m_objectId);
}
FUN_10079050(m_placedPartCount);
m_placedPartCount++;
((LegoCarBuild*)m_currentWorld)->SetPlacedPartCount(m_placedPartCount);
((LegoCarBuild*) m_currentWorld)->SetPlacedPartCount(m_placedPartCount);
if (m_placedPartCount < m_numberOfParts) {
FUN_10079680(m_parts[m_placedPartCount].m_wiredName);
@ -660,7 +652,7 @@ MxBool LegoCarBuildAnimPresenter::StringEndsOnY(const LegoChar* p_string)
// FUNCTION: LEGO1 0x10079d30
// FUNCTION: BETA10 0x1007280e
MxBool LegoCarBuildAnimPresenter::StringEndsOnZero(const LegoChar* p_string)
MxBool LegoCarBuildAnimPresenter::StringDoesNotEndOnZero(const LegoChar* p_string)
{
return (p_string[strlen(p_string) - 1] != '0');
}

3
LEGO1/lego/sources/misc/legoutil.h
View File

@ -39,6 +39,9 @@ inline void Swap(T& p_t1, T& p_t2)
p_t2 = t;
}
// TEMPLATE: BETA10 0x10073c20
// Swap
template <class T>
inline T DToR(T p_d)
{