mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 17:04:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CaveEntity class (#1024)

Browse Source 
* Fix CaveEntity class

* Rename function
This commit is contained in:
Christian Semmler
2024-06-12 10:20:51 -04:00
committed by GitHub
parent 475d21f8c8
commit 641d9f1b8b
6 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/actors/buildingentity.cpp
View File

@@ -22,7 +22,7 @@ BuildingEntity::~BuildingEntity()
MxLong BuildingEntity::Notify(MxParam& p_param)
{
if (((MxNotificationParam&) p_param).GetType() == c_notificationClick) {
return VTable0x50(p_param);
return HandleClick((LegoEventNotificationParam&) p_param);
}
return 0;

26
LEGO1/lego/legoomni/src/actors/buildings.cpp
View File

@@ -24,7 +24,7 @@ DECOMP_SIZE_ASSERT(PoliceEntity, 0x68)
DECOMP_SIZE_ASSERT(RaceStandsEntity, 0x68)
// FUNCTION: LEGO1 0x100150c0
MxLong InfoCenterEntity::VTable0x50(MxParam& p_param)
MxLong InfoCenterEntity::HandleClick(LegoEventNotificationParam& p_param)
{
switch (GameState()->GetCurrentAct()) {
case LegoGameState::Act::e_act1: {
@@ -62,7 +62,7 @@ MxLong InfoCenterEntity::VTable0x50(MxParam& p_param)
}
// FUNCTION: LEGO1 0x100151d0
MxLong GasStationEntity::VTable0x50(MxParam& p_param)
MxLong GasStationEntity::HandleClick(LegoEventNotificationParam& p_param)
{
if (FUN_1003ef60()) {
Act1State* state = (Act1State*) GameState()->GetState("Act1State");
@@ -86,7 +86,7 @@ MxLong GasStationEntity::VTable0x50(MxParam& p_param)
}
// FUNCTION: LEGO1 0x10015270
MxLong HospitalEntity::VTable0x50(MxParam& p_param)
MxLong HospitalEntity::HandleClick(LegoEventNotificationParam& p_param)
{
if (FUN_1003ef60()) {
Act1State* act1State = (Act1State*) GameState()->GetState("Act1State");
@@ -110,7 +110,7 @@ MxLong HospitalEntity::VTable0x50(MxParam& p_param)
}
// FUNCTION: LEGO1 0x10015310
MxLong PoliceEntity::VTable0x50(MxParam& p_param)
MxLong PoliceEntity::HandleClick(LegoEventNotificationParam& p_param)
{
if (FUN_1003ef60()) {
Act1State* state = (Act1State*) GameState()->GetState("Act1State");
@@ -134,7 +134,7 @@ MxLong PoliceEntity::VTable0x50(MxParam& p_param)
}
// FUNCTION: LEGO1 0x100153b0
MxLong BeachHouseEntity::VTable0x50(MxParam& p_param)
MxLong BeachHouseEntity::HandleClick(LegoEventNotificationParam& p_param)
{
if (FUN_1003ef60()) {
Act1State* state = (Act1State*) GameState()->GetState("Act1State");
@@ -155,7 +155,7 @@ MxLong BeachHouseEntity::VTable0x50(MxParam& p_param)
}
// FUNCTION: LEGO1 0x10015450
MxLong RaceStandsEntity::VTable0x50(MxParam& p_param)
MxLong RaceStandsEntity::HandleClick(LegoEventNotificationParam& p_param)
{
if (FUN_1003ef60()) {
Act1State* state = (Act1State*) GameState()->GetState("Act1State");
@@ -174,3 +174,17 @@ MxLong RaceStandsEntity::VTable0x50(MxParam& p_param)
return 1;
}
// STUB: LEGO1 0x100154f0
MxLong JailEntity::HandleClick(LegoEventNotificationParam& p_param)
{
// TODO
return 0;
}
// STUB: LEGO1 0x10015520
MxLong CaveEntity::HandleClick(LegoEventNotificationParam& p_param)
{
// TODO
return 0;
}

1
LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
View File

@@ -67,7 +67,6 @@
#include "act3shark.h"
#include "buildings.h"
#include "bumpbouy.h"
#include "caveentity.h"
#include "jukebox.h"
#include "jukeboxentity.h"
#include "legometerpresenter.h"