mirror of
https://github.com/isledecomp/isle-portable.git
synced 2024-11-22 15:37:55 -05:00
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.
This commit is contained in:
parent
12395ac41a
commit
66a010a19f
5 changed files with 5 additions and 90 deletions
|
@ -79,9 +79,6 @@ class Isle
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// OFFSET: ISLE 0x401c40
|
|
||||||
inline void MxDSObject::SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; }
|
|
||||||
|
|
||||||
// OFFSET: ISLE 0x402c20
|
// OFFSET: ISLE 0x402c20
|
||||||
inline void Isle::Tick(BOOL sleepIfNotNextFrame)
|
inline void Isle::Tick(BOOL sleepIfNotNextFrame)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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;
|
|
||||||
}
|
|
||||||
|
|
|
@ -17,7 +17,9 @@ class MxDSObject : public MxCore
|
||||||
inline void SetUnknown1c(int p_unk1c) { this->m_unk1c = p_unk1c; }
|
inline void SetUnknown1c(int p_unk1c) { this->m_unk1c = p_unk1c; }
|
||||||
inline void SetUnknown24(short p_unk24) { this->m_unk24 = p_unk24; }
|
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:
|
private:
|
||||||
int m_unk08;
|
int m_unk08;
|
||||||
|
|
82
isle.mak
82
isle.mak
|
@ -493,9 +493,6 @@ DEP_CPP_DLLMA=\
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\LEGO1\legoomni.cpp
|
SOURCE=.\LEGO1\legoomni.cpp
|
||||||
|
|
||||||
!IF "$(CFG)" == "LEGO1 - Win32 Release"
|
|
||||||
|
|
||||||
DEP_CPP_LEGOO=\
|
DEP_CPP_LEGOO=\
|
||||||
".\LEGO1\lego3dmanager.h"\
|
".\LEGO1\lego3dmanager.h"\
|
||||||
".\LEGO1\lego3dview.h"\
|
".\LEGO1\lego3dview.h"\
|
||||||
|
@ -544,45 +541,13 @@ DEP_CPP_LEGOO=\
|
||||||
$(CPP) $(CPP_PROJ) $(SOURCE)
|
$(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
|
# End Source File
|
||||||
################################################################################
|
################################################################################
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\LEGO1\mxcriticalsection.cpp
|
SOURCE=.\LEGO1\mxcriticalsection.cpp
|
||||||
DEP_CPP_MXCRI=\
|
DEP_CPP_MXCRI=\
|
||||||
|
".\LEGO1\legoinc.h"\
|
||||||
".\LEGO1\mxcriticalsection.h"\
|
".\LEGO1\mxcriticalsection.h"\
|
||||||
|
|
||||||
|
|
||||||
|
@ -596,6 +561,7 @@ DEP_CPP_MXCRI=\
|
||||||
|
|
||||||
SOURCE=.\LEGO1\mxautolocker.cpp
|
SOURCE=.\LEGO1\mxautolocker.cpp
|
||||||
DEP_CPP_MXAUT=\
|
DEP_CPP_MXAUT=\
|
||||||
|
".\LEGO1\legoinc.h"\
|
||||||
".\LEGO1\mxautolocker.h"\
|
".\LEGO1\mxautolocker.h"\
|
||||||
".\LEGO1\mxcriticalsection.h"\
|
".\LEGO1\mxcriticalsection.h"\
|
||||||
|
|
||||||
|
@ -773,9 +739,6 @@ DEP_CPP_MXOMNICR=\
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\LEGO1\legonavcontroller.cpp
|
SOURCE=.\LEGO1\legonavcontroller.cpp
|
||||||
|
|
||||||
!IF "$(CFG)" == "LEGO1 - Win32 Release"
|
|
||||||
|
|
||||||
DEP_CPP_LEGON=\
|
DEP_CPP_LEGON=\
|
||||||
".\LEGO1\lego3dmanager.h"\
|
".\LEGO1\lego3dmanager.h"\
|
||||||
".\LEGO1\lego3dview.h"\
|
".\LEGO1\lego3dview.h"\
|
||||||
|
@ -825,40 +788,6 @@ DEP_CPP_LEGON=\
|
||||||
$(CPP) $(CPP_PROJ) $(SOURCE)
|
$(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
|
# End Source File
|
||||||
################################################################################
|
################################################################################
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
@ -984,28 +913,21 @@ SOURCE=.\ISLE\main.cpp
|
||||||
DEP_CPP_MAIN_=\
|
DEP_CPP_MAIN_=\
|
||||||
".\ISLE\define.h"\
|
".\ISLE\define.h"\
|
||||||
".\ISLE\isle.h"\
|
".\ISLE\isle.h"\
|
||||||
".\ISLE\res\resource.h"\
|
|
||||||
".\LEGO1\lego3dmanager.h"\
|
".\LEGO1\lego3dmanager.h"\
|
||||||
".\LEGO1\lego3dview.h"\
|
".\LEGO1\lego3dview.h"\
|
||||||
".\LEGO1\legoanimationmanager.h"\
|
|
||||||
".\LEGO1\legobuildingmanager.h"\
|
|
||||||
".\LEGO1\legoentity.h"\
|
".\LEGO1\legoentity.h"\
|
||||||
".\LEGO1\legogamestate.h"\
|
".\LEGO1\legogamestate.h"\
|
||||||
".\LEGO1\legoinc.h"\
|
".\LEGO1\legoinc.h"\
|
||||||
".\LEGO1\legoinputmanager.h"\
|
".\LEGO1\legoinputmanager.h"\
|
||||||
".\LEGO1\legomodelpresenter.h"\
|
|
||||||
".\LEGO1\legonavcontroller.h"\
|
".\LEGO1\legonavcontroller.h"\
|
||||||
".\LEGO1\legoomni.h"\
|
".\LEGO1\legoomni.h"\
|
||||||
".\LEGO1\legopartpresenter.h"\
|
|
||||||
".\LEGO1\legoroi.h"\
|
".\LEGO1\legoroi.h"\
|
||||||
".\LEGO1\legovideomanager.h"\
|
".\LEGO1\legovideomanager.h"\
|
||||||
".\LEGO1\legoworldpresenter.h"\
|
|
||||||
".\LEGO1\mxatomid.h"\
|
".\LEGO1\mxatomid.h"\
|
||||||
".\LEGO1\mxbackgroundaudiomanager.h"\
|
".\LEGO1\mxbackgroundaudiomanager.h"\
|
||||||
".\LEGO1\mxbool.h"\
|
".\LEGO1\mxbool.h"\
|
||||||
".\LEGO1\mxcore.h"\
|
".\LEGO1\mxcore.h"\
|
||||||
".\LEGO1\mxcriticalsection.h"\
|
".\LEGO1\mxcriticalsection.h"\
|
||||||
".\LEGO1\mxdirectdraw.h"\
|
|
||||||
".\LEGO1\mxdsaction.h"\
|
".\LEGO1\mxdsaction.h"\
|
||||||
".\LEGO1\mxdsfile.h"\
|
".\LEGO1\mxdsfile.h"\
|
||||||
".\LEGO1\mxdsobject.h"\
|
".\LEGO1\mxdsobject.h"\
|
||||||
|
|
BIN
isle.mdp
BIN
isle.mdp
Binary file not shown.
Loading…
Reference in a new issue