Implement Helicopter::VTable0xe4 (#243)

Clean up parent classes
This commit is contained in:
Nathan M Gilbert
2023-10-24 08:37:02 -04:00
committed by GitHub
parent 74329d681b
commit af1745db18
19 changed files with 513 additions and 162 deletions

View File

@@ -58,27 +58,28 @@ public:
virtual void Init() override; // vtable+14
virtual MxResult Create(COMPAT_CONST MxOmniCreateParam &p) override; // vtable+18
virtual void Destroy() override; // vtable+1c
virtual MxResult Start(MxDSAction* action) override;
virtual MxResult DeleteObject(MxDSAction &ds) override;
virtual MxBool DoesEntityExist(MxDSAction &ds) override;
virtual void vtable0x2c() override;
virtual int vtable0x30(char*, int, MxCore*) override;
virtual void NotifyCurrentEntity(MxNotificationParam *p_param) override;
virtual void StartTimer() override;
virtual void StopTimer() override;
virtual MxResult Start(MxDSAction* action) override; // vtable+20
virtual MxResult DeleteObject(MxDSAction &ds) override; // vtable+24
virtual MxBool DoesEntityExist(MxDSAction &ds) override; // vtable+28
virtual int Vtable0x30(char*, int, MxCore*) override; // vtable+30
virtual void NotifyCurrentEntity(MxNotificationParam *p_param) override; //vtable+34
virtual void StartTimer() override; // vtable+38
virtual void StopTimer() override; //vtable+3c
LegoVideoManager *GetVideoManager() { return (LegoVideoManager *) m_videoManager; }
LegoSoundManager *GetSoundManager() { return (LegoSoundManager *)m_soundManager;}
MxBackgroundAudioManager *GetBackgroundAudioManager() { return m_bkgAudioManager; }
LegoVideoManager *GetVideoManager() { return (LegoVideoManager *)m_videoManager; }
LegoSoundManager *GetSoundManager() { return (LegoSoundManager *)m_soundManager; }
LegoInputManager *GetInputManager() { return m_inputMgr; }
Isle *GetIsle() { return m_isle; }
LegoBuildingManager *GetLegoBuildingManager() { return m_buildingManager; }
LegoPlantManager *GetLegoPlantManager() { return m_plantManager; }
LegoGameState *GetGameState() { return m_gameState; }
LegoNavController *GetNavController() { return m_navController; }
MxTransitionManager *GetTransitionManager() { return m_transitionManager; }
LegoWorld *GetCurrentWorld() { return m_currentWorld; }
GifManager *GetGifManager() { return m_gifManager; }
LegoWorld *GetCurrentWorld() { return m_currentWorld; }
LegoNavController *GetNavController() { return m_navController; }
LegoWorld *GetCurrentVehicle() { return m_currentVehicle; }
LegoPlantManager *GetLegoPlantManager() { return m_plantManager; }
LegoAnimationManager *GetAnimationManager() { return m_animationManager; }
LegoBuildingManager *GetLegoBuildingManager() { return m_buildingManager; }
LegoGameState *GetGameState() { return m_gameState; }
MxBackgroundAudioManager *GetBackgroundAudioManager() { return m_bkgAudioManager; }
MxTransitionManager *GetTransitionManager() { return m_transitionManager; }
private:
undefined4 m_unk68;
@@ -89,10 +90,10 @@ private:
LegoWorld *m_currentWorld;
MxBool m_unk80;
LegoNavController *m_navController; // 0x84
Isle* m_isle; // 0x88
LegoUnkSaveDataWriter* m_unkLegoSaveDataWriter;
LegoPlantManager* m_plantManager; // 0x90
LegoAnimationManager* m_animationManager;
LegoWorld *m_currentVehicle; // 0x88
LegoUnkSaveDataWriter *m_unkLegoSaveDataWriter;
LegoPlantManager *m_plantManager; // 0x90
LegoAnimationManager *m_animationManager;
LegoBuildingManager* m_buildingManager; // 0x98
LegoGameState *m_gameState; // 0x9c
MxDSAction m_action;
@@ -101,25 +102,26 @@ private:
MxBool m_unk13c;
};
__declspec(dllexport) MxBackgroundAudioManager * BackgroundAudioManager();
__declspec(dllexport) MxDSObject * CreateStreamObject(MxDSFile *,MxS16);
__declspec(dllexport) LegoGameState * GameState();
__declspec(dllexport) const char * GetNoCD_SourceName();
__declspec(dllexport) LegoInputManager * InputManager();
__declspec(dllexport) LegoOmni * Lego();
__declspec(dllexport) MxBackgroundAudioManager *BackgroundAudioManager();
__declspec(dllexport) MxDSObject *CreateStreamObject(MxDSFile *, MxS16);
__declspec(dllexport) LegoGameState *GameState();
__declspec(dllexport) const char *GetNoCD_SourceName();
__declspec(dllexport) LegoInputManager *InputManager();
__declspec(dllexport) LegoOmni *Lego();
__declspec(dllexport) void MakeSourceName(char *, const char *);
__declspec(dllexport) LegoEntity * PickEntity(MxLong,MxLong);
__declspec(dllexport) LegoROI * PickROI(MxLong,MxLong);
__declspec(dllexport) void SetOmniUserMessage(void (*)(const char *,int));
__declspec(dllexport) LegoSoundManager * SoundManager();
__declspec(dllexport) LegoEntity *PickEntity(MxLong,MxLong);
__declspec(dllexport) LegoROI *PickROI(MxLong,MxLong);
__declspec(dllexport) void SetOmniUserMessage(void (*)(const char *, int));
__declspec(dllexport) LegoSoundManager *SoundManager();
__declspec(dllexport) MxResult Start(MxDSAction*);
__declspec(dllexport) MxTransitionManager * TransitionManager();
__declspec(dllexport) LegoVideoManager * VideoManager();
__declspec(dllexport) MxTransitionManager *TransitionManager();
__declspec(dllexport) LegoVideoManager *VideoManager();
LegoBuildingManager* BuildingManager();
LegoControlManager* ControlManager();
Isle* GetIsle();
LegoPlantManager* PlantManager();
LegoAnimationManager *AnimationManager();
LegoBuildingManager *BuildingManager();
LegoControlManager *ControlManager();
LegoWorld *GetCurrentVehicle();
LegoPlantManager *PlantManager();
MxBool KeyValueStringParse(char *, const char *, const char *);
LegoWorld *GetCurrentWorld();
GifManager *GetGifManager();