implement/match HospitalEntity::VTable0x50() (#738)

This commit is contained in:
Ramen2X 2024-03-27 12:12:20 -04:00 committed by GitHub
parent 483b3a5ab7
commit 1cf60ccda6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 2 deletions

View file

@ -20,8 +20,7 @@ class HospitalEntity : public BuildingEntity {
return !strcmp(p_name, HospitalEntity::ClassName()) || BuildingEntity::IsA(p_name); return !strcmp(p_name, HospitalEntity::ClassName()) || BuildingEntity::IsA(p_name);
} }
// STUB: LEGO1 0x10015270 MxLong VTable0x50(MxParam& p_param) override; // vtable+0x50
MxLong VTable0x50(MxParam& p_param) override { return 0; }
// SYNTHETIC: LEGO1 0x1000f820 // SYNTHETIC: LEGO1 0x1000f820
// HospitalEntity::`scalar deleting destructor' // HospitalEntity::`scalar deleting destructor'

View file

@ -1,3 +1,39 @@
#include "hospitalentity.h" #include "hospitalentity.h"
#include "act1state.h"
#include "isle.h"
#include "isle_actions.h"
#include "islepathactor.h"
#include "legoanimationmanager.h"
#include "legogamestate.h"
#include "legoomni.h"
#include "legoutils.h"
#include "legoworld.h"
#include "misc.h"
#include "mxtransitionmanager.h"
DECOMP_SIZE_ASSERT(HospitalEntity, 0x68) DECOMP_SIZE_ASSERT(HospitalEntity, 0x68)
// FUNCTION: LEGO1 0x10015270
MxLong HospitalEntity::VTable0x50(MxParam& p_param)
{
if (FUN_1003ef60()) {
Act1State* act1State = (Act1State*) GameState()->GetState("Act1State");
if (act1State->GetUnknown18() != 10) {
act1State->SetUnknown18(0);
if (CurrentActor()->GetActorId() != GameState()->GetActorId()) {
CurrentActor()->VTable0xe4();
}
Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
isle->SetDestLocation(LegoGameState::Area::e_hospital);
AnimationManager()->FUN_10061010(NULL);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
}
}
return 1;
}