From 66a010a19fa9c2b635afb2897be88ec18364e72b Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 22 Jun 2023 00:45:56 -0700 Subject: [PATCH] move inlined MxDSObject::SetAtomId to main header We've confirmed that, despite a function being declared inline, msvc will still make a conventional call in some circumstances. As such, I feel like this is warranted because it's most likely what a developer would have actually written. --- ISLE/isle.h | 3 -- LEGO1/mxdsobject.cpp | 6 ---- LEGO1/mxdsobject.h | 4 ++- isle.mak | 82 ++----------------------------------------- isle.mdp | Bin 50688 -> 48128 bytes 5 files changed, 5 insertions(+), 90 deletions(-) diff --git a/ISLE/isle.h b/ISLE/isle.h index 8eb37fa7..e556a5c4 100644 --- a/ISLE/isle.h +++ b/ISLE/isle.h @@ -79,9 +79,6 @@ class Isle }; -// OFFSET: ISLE 0x401c40 -inline void MxDSObject::SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } - // OFFSET: ISLE 0x402c20 inline void Isle::Tick(BOOL sleepIfNotNextFrame) { diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/mxdsobject.cpp index 8142ba9d..7323f446 100644 --- a/LEGO1/mxdsobject.cpp +++ b/LEGO1/mxdsobject.cpp @@ -34,9 +34,3 @@ void MxDSObject::SetObjectName(const char *p_name) } } } - -// OFFSET: LEGO1 0x10005530 -void MxDSObject::SetAtomId(MxAtomId p_atomId) -{ - this->m_atomId = p_atomId; -} diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h index 4f59d4bb..468076f7 100644 --- a/LEGO1/mxdsobject.h +++ b/LEGO1/mxdsobject.h @@ -17,7 +17,9 @@ class MxDSObject : public MxCore inline void SetUnknown1c(int p_unk1c) { this->m_unk1c = p_unk1c; } inline void SetUnknown24(short p_unk24) { this->m_unk24 = p_unk24; } - void SetAtomId(MxAtomId p_atomId); + // OFFSET: ISLE 0x401c40 + // OFFSET: LEGO1 0x10005530 + inline void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } private: int m_unk08; diff --git a/isle.mak b/isle.mak index acbf2236..53c8f2bd 100644 --- a/isle.mak +++ b/isle.mak @@ -493,9 +493,6 @@ DEP_CPP_DLLMA=\ # Begin Source File SOURCE=.\LEGO1\legoomni.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_LEGOO=\ ".\LEGO1\lego3dmanager.h"\ ".\LEGO1\lego3dview.h"\ @@ -544,45 +541,13 @@ DEP_CPP_LEGOO=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_LEGOO=\ - ".\LEGO1\lego3dmanager.h"\ - ".\LEGO1\lego3dview.h"\ - ".\LEGO1\legoentity.h"\ - ".\LEGO1\legogamestate.h"\ - ".\LEGO1\legoinc.h"\ - ".\LEGO1\legoinputmanager.h"\ - ".\LEGO1\legonavcontroller.h"\ - ".\LEGO1\legoomni.h"\ - ".\LEGO1\legoroi.h"\ - ".\LEGO1\legovideomanager.h"\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxbackgroundaudiomanager.h"\ - ".\LEGO1\mxbool.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxcriticalsection.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsfile.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxeventmanager.h"\ - ".\LEGO1\mxomni.h"\ - ".\LEGO1\mxtimer.h"\ - ".\LEGO1\viewmanager.h"\ - - -"$(INTDIR)\legoomni.obj" : $(SOURCE) $(DEP_CPP_LEGOO) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxcriticalsection.cpp DEP_CPP_MXCRI=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxcriticalsection.h"\ @@ -596,6 +561,7 @@ DEP_CPP_MXCRI=\ SOURCE=.\LEGO1\mxautolocker.cpp DEP_CPP_MXAUT=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxautolocker.h"\ ".\LEGO1\mxcriticalsection.h"\ @@ -773,9 +739,6 @@ DEP_CPP_MXOMNICR=\ # Begin Source File SOURCE=.\LEGO1\legonavcontroller.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_LEGON=\ ".\LEGO1\lego3dmanager.h"\ ".\LEGO1\lego3dview.h"\ @@ -825,40 +788,6 @@ DEP_CPP_LEGON=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_LEGON=\ - ".\LEGO1\lego3dmanager.h"\ - ".\LEGO1\lego3dview.h"\ - ".\LEGO1\legoentity.h"\ - ".\LEGO1\legogamestate.h"\ - ".\LEGO1\legoinc.h"\ - ".\LEGO1\legoinputmanager.h"\ - ".\LEGO1\legonavcontroller.h"\ - ".\LEGO1\legoomni.h"\ - ".\LEGO1\legoroi.h"\ - ".\LEGO1\legoutil.h"\ - ".\LEGO1\legovideomanager.h"\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxbackgroundaudiomanager.h"\ - ".\LEGO1\mxbool.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxcriticalsection.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsfile.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxeventmanager.h"\ - ".\LEGO1\mxomni.h"\ - ".\LEGO1\mxtimer.h"\ - ".\LEGO1\viewmanager.h"\ - - -"$(INTDIR)\legonavcontroller.obj" : $(SOURCE) $(DEP_CPP_LEGON) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File @@ -984,28 +913,21 @@ SOURCE=.\ISLE\main.cpp DEP_CPP_MAIN_=\ ".\ISLE\define.h"\ ".\ISLE\isle.h"\ - ".\ISLE\res\resource.h"\ ".\LEGO1\lego3dmanager.h"\ ".\LEGO1\lego3dview.h"\ - ".\LEGO1\legoanimationmanager.h"\ - ".\LEGO1\legobuildingmanager.h"\ ".\LEGO1\legoentity.h"\ ".\LEGO1\legogamestate.h"\ ".\LEGO1\legoinc.h"\ ".\LEGO1\legoinputmanager.h"\ - ".\LEGO1\legomodelpresenter.h"\ ".\LEGO1\legonavcontroller.h"\ ".\LEGO1\legoomni.h"\ - ".\LEGO1\legopartpresenter.h"\ ".\LEGO1\legoroi.h"\ ".\LEGO1\legovideomanager.h"\ - ".\LEGO1\legoworldpresenter.h"\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxbackgroundaudiomanager.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ ".\LEGO1\mxcriticalsection.h"\ - ".\LEGO1\mxdirectdraw.h"\ ".\LEGO1\mxdsaction.h"\ ".\LEGO1\mxdsfile.h"\ ".\LEGO1\mxdsobject.h"\ diff --git a/isle.mdp b/isle.mdp index a35b41d166591b9a4cb0900d43013fff86967b52..0a0a443d90e0d5a067e5d1e0ed2b0de17456ba1b 100644 GIT binary patch literal 48128 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