diff --git a/ISLE/isle.cpp b/ISLE/isle.cpp index deb3d6e1..5438005a 100644 --- a/ISLE/isle.cpp +++ b/ISLE/isle.cpp @@ -109,7 +109,7 @@ void Isle::close() } Timer()->GetRealTime(); - TickleManager()->vtable08(); + TickleManager()->Tickle(); } } } @@ -568,7 +568,7 @@ void Isle::tick(BOOL sleepIfNotNextFrame) } if (this->m_frameDelta + g_lastFrameTime < currentTime) { if (!Lego()->vtable40()) { - TickleManager()->vtable08(); + TickleManager()->Tickle(); } g_lastFrameTime = currentTime; diff --git a/LEGO1/mxcore.cpp b/LEGO1/mxcore.cpp index 290abca4..da8fe0b9 100644 --- a/LEGO1/mxcore.cpp +++ b/LEGO1/mxcore.cpp @@ -19,7 +19,7 @@ long MxCore::Notify(MxParam &p) return 0; } -long MxCore::FUN_10001f70() +long MxCore::Tickle() { return 0; } diff --git a/LEGO1/mxcore.h b/LEGO1/mxcore.h index 6561a23f..b4038b06 100644 --- a/LEGO1/mxcore.h +++ b/LEGO1/mxcore.h @@ -11,7 +11,7 @@ class MxCore __declspec(dllexport) MxCore(); __declspec(dllexport) virtual ~MxCore(); __declspec(dllexport) virtual long Notify(MxParam &p); - virtual long FUN_10001f70(); + virtual long Tickle(); virtual const char *GetClassName() const; virtual MxBool IsClass(const char *name) const; diff --git a/LEGO1/mxticklemanager.h b/LEGO1/mxticklemanager.h index ff27d76c..d39022f7 100644 --- a/LEGO1/mxticklemanager.h +++ b/LEGO1/mxticklemanager.h @@ -1,15 +1,14 @@ #ifndef MXTICKLEMANAGER_H #define MXTICKLEMANAGER_H -class MxTickleManager +class MxTickleManager : public MxCore { public: virtual ~MxTickleManager(); - virtual void vtable04(); - virtual void vtable08(); - virtual void vtable0c(); - virtual void vtable10(); + virtual long Tickle(); + virtual const char *GetClassName() const; + virtual MxBool IsClass(const char *name) const; virtual void vtable14(); virtual void vtable18(); virtual void vtable1c(void *v, int p); diff --git a/isle.mak b/isle.mak index a0ef5353..74713d10 100644 --- a/isle.mak +++ b/isle.mak @@ -422,12 +422,8 @@ DEP_CPP_MXCOR=\ # Begin Source File SOURCE=.\LEGO1\dllmain.cpp -DEP_CPP_DLLMA=\ - ".\LEGO1\mxbool.h"\ - ".\LEGO1\mxcore.h"\ - -"$(INTDIR)\dllmain.obj" : $(SOURCE) $(DEP_CPP_DLLMA) "$(INTDIR)" +"$(INTDIR)\dllmain.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -499,6 +495,9 @@ DEP_CPP_ISLE_=\ ".\LEGO1\mxvideoparam.h"\ ".\LEGO1\mxvideoparamflags.h"\ +NODEP_CPP_ISLE_=\ + ".\LEGO1\define.h"\ + "$(INTDIR)\isle.obj" : $(SOURCE) $(DEP_CPP_ISLE_) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -543,6 +542,9 @@ DEP_CPP_MAIN_=\ ".\LEGO1\mxvideoparam.h"\ ".\LEGO1\mxvideoparamflags.h"\ +NODEP_CPP_MAIN_=\ + ".\LEGO1\define.h"\ + "$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/isle.mdp b/isle.mdp index 44ab9740..4fed0b71 100644 Binary files a/isle.mdp and b/isle.mdp differ