isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-22 15:48:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Begin work on Police class (#469)

Browse source 
* Begin work on Police class

* Use JukeBox::e_policeStation value

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Joshua Peisach 2024-01-20 15:49:56 -05:00 committed by GitHub
parent 1c612a2d25
commit 67fa5e7cca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 65 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
LEGO1/lego/legoomni/include/police.h
View file

@ -1,7 +1,11 @@
#ifndef POLICE_H
#define POLICE_H
#include "decomp.h"
#include "legoworld.h"
#include "mxdsaction.h"
#include "policestate.h"
#include "radio.h"
// VTABLE: LEGO1 0x100d8a80
// SIZE 0x110
@ -28,6 +32,14 @@ class Police : public LegoWorld {
// SYNTHETIC: LEGO1 0x1005e300
// Police::`scalar deleting destructor'
virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
virtual void VTable0x50() override; // vtable+0x50
private:
Radio m_radio; // 0xf8
PoliceState* m_policeState; // 0x108
undefined4 m_unk0x10c; // 0x10c
};
#endif // POLICE_H

57
LEGO1/lego/legoomni/src/police/police.cpp
View file

@ -1,15 +1,56 @@
#include "police.h"
// STUB: LEGO1 0x1005e130
#include "jukebox.h"
#include "legocontrolmanager.h"
#include "legogamestate.h"
#include "legoinputmanager.h"
#include "legoomni.h"
#include "mxnotificationmanager.h"
DECOMP_SIZE_ASSERT(Police, 0x110)
// FUNCTION: LEGO1 0x1005e130
Police::Police()
{
// TODO
m_policeState = NULL;
m_unk0x10c = 0;
NotificationManager()->Register(this);
}
// STUB: LEGO1 0x1005e320
// FUNCTION: LEGO1 0x1005e320
Police::~Police()
{
// TODO
if (InputManager()->GetWorld() == this) {
InputManager()->ClearWorld();
}
ControlManager()->Unregister(this);
InputManager()->UnRegister(this);
NotificationManager()->Unregister(this);
}
// FUNCTION: LEGO1 0x1005e3e0
MxResult Police::Create(MxDSAction& p_dsAction)
{
MxResult ret = LegoWorld::Create(p_dsAction);
if (ret == SUCCESS) {
InputManager()->SetWorld(this);
ControlManager()->Register(this);
}
SetIsWorldActive(FALSE);
InputManager()->Register(this);
LegoGameState* gameState = GameState();
PoliceState* policeState = (PoliceState*) gameState->GetState("PoliceState");
if (!policeState) {
policeState = (PoliceState*) gameState->CreateState("PoliceState");
}
m_policeState = policeState;
GameState()->SetUnknown424(0x22);
GameState()->FUN_1003a720(0);
return ret;
}
// STUB: LEGO1 0x1005e480
@ -19,3 +60,11 @@ MxLong Police::Notify(MxParam& p_param)
return 0;
}
// FUNCTION: LEGO1 0x1005e530
void Police::VTable0x50()
{
LegoWorld::VTable0x50();
PlayMusic(JukeBox::e_policeStation);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
}