isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-26 17:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

push changes

Browse Source
This commit is contained in:
Misha 2023-12-26 17:44:03 -05:00
parent 5b730cc6ca
commit cd74e22829
No known key found for this signature in database
GPG Key ID: 8441D12AEF33FED8
7 changed files with 155 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/act3actor.h
View File

@ -3,7 +3,7 @@
// FIXME: Uncertain location. There are three vtables which eventually call this // FIXME: Uncertain location. There are three vtables which eventually call this
// class' ClassName() function, but none of them call it directly. // class' ClassName() function, but none of them call it directly.
class Act3Actor { class Act3Actor : public MxCore {
public: public:
// FUNCTION: LEGO1 0x100431b0 // FUNCTION: LEGO1 0x100431b0
inline virtual const char* ClassName() override inline virtual const char* ClassName() override

4
LEGO1/lego3dwavepresenter.h
View File

@ -1,11 +1,11 @@
#ifndef LEGO3DWAVEPRESENTER_H #ifndef LEGO3DWAVEPRESENTER_H
#define LEGO3DWAVEPRESENTER_H #define LEGO3DWAVEPRESENTER_H
#include "legowavepresenter.h" #include "mxwavepresenter.h"
// VTABLE: LEGO1 0x100d52b0 // VTABLE: LEGO1 0x100d52b0
// SIZE 0xa0 // SIZE 0xa0
class Lego3DWavePresenter : public LegoWavePresenter { class Lego3DWavePresenter : public MxWavePresenter {
public: public:
// FUNCTION: LEGO1 0x1000d890 // FUNCTION: LEGO1 0x1000d890
inline virtual const char* ClassName() const override // vtable+0x0c inline virtual const char* ClassName() const override // vtable+0x0c

13
LEGO1/legoact2.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef LEGOACT2_H
#define LEGOACT2_H
#include "legopathactor.h"
#include "legocarraceactor.h"
// VTABLE: LEGO1 0x100d82e0
// SIZE: 0x1154
class LegoAct2 : public LegoWorld {
};
#endif // LEGOACT2_H

199
LEGO1/legoobjectfactory.cpp
View File

@ -1,106 +1,105 @@
#include "legoobjectfactory.h" #include "legoobjectfactory.h"
#include "decomp.h" #include "decomp.h"
#include "LegoModelPresenter.h" #include "legomodelpresenter.h"
#include "LegoTexturePresenter.h" #include "legotexturepresenter.h"
#include "LegoPhonemePresenter.h" #include "legophonemepresenter.h"
#include "LegoFlcTexturePresenter.h" #include "legoflctexturepresenter.h"
#include "LegoEntityPresenter.h" #include "legoentitypresenter.h"
#include "LegoActorPresenter.h" #include "legoactorpresenter.h"
#include "LegoWorldPresenter.h" #include "legoworldpresenter.h"
#include "LegoWorld.h" #include "legoworld.h"
#include "LegoPalettePresenter.h" #include "legopalettepresenter.h"
#include "LegoPathPresenter.h" #include "legopathpresenter.h"
#include "LegoAnimPresenter.h" #include "legoanimpresenter.h"
#include "LegoLoopingAnimPresenter.h" #include "legoloopinganimpresenter.h"
#include "LegoLocomotionAnimPresenter.h" #include "legolocomotionanimpresenter.h"
#include "LegoHideAnimPresenter.h" #include "legohideanimpresenter.h"
#include "LegoPartPresenter.h" #include "legopartpresenter.h"
#include "LegoCarBuildAnimPresenter.h" #include "legocarbuildanimpresenter.h"
#include "LegoActionControlPresenter.h" #include "legoactioncontrolpresenter.h"
#include "MxVideoPresenter.h" #include "mxvideopresenter.h"
#include "LegoLoadCacheSoundPresenter.h" #include "legoloadcachesoundpresenter.h"
#include "Lego3DWavePresenter.h" #include "lego3dwavepresenter.h"
#include "LegoActor.h" #include "legoactor.h"
#include "LegoPathActor.h" #include "legopathactor.h"
//#include "LegoRaceCar.h" #include "legoracecar.h"
#include "LegoJetski.h" #include "legojetski.h"
#include "JetskiRace.h" #include "jetskirace.h"
#include "LegoEntity.h" #include "legoentity.h"
#include "LegoCarRaceActor.h" #include "legocarraceactor.h"
#include "LegoJetskiRaceActor.h" #include "legojetskiraceactor.h"
#include "LegoCarBuild.h" #include "legocarbuild.h"
#include "Infocenter.h" #include "infocenter.h"
#include "LegoAnimActor.h" #include "legoanimactor.h"
#include "MxControlPresenter.h" #include "mxcontrolpresenter.h"
#include "RegistrationBook.h" #include "registrationbook.h"
#include "HistoryBook.h" #include "historybook.h"
#include "ElevatorBottom.h" #include "elevatorbottom.h"
#include "InfocenterDoor.h" #include "infocenterdoor.h"
#include "Score.h" #include "score.h"
#include "ScoreState.h" #include "scorestate.h"
#include "Hospital.h" #include "hospital.h"
#include "Isle.h" #include "isle.h"
#include "Police.h" #include "police.h"
#include "GasStation.h" #include "gasstation.h"
//#include "LegoAct2.h" #include "legoact2.h"
#include "LegoAct2State.h" #include "legoact2state.h"
#include "CarRace.h" #include "carrace.h"
//#include "LegoRaceCarBuildState.h" #include "hospitalstate.h"
//#include "LegoCopterBuildState.h" #include "infocenterstate.h"
//#include "LegoDuneCarBuildState.h" #include "policestate.h"
//#include "LegoJetskiBuildState.h" #include "gasstationstate.h"
#include "HospitalState.h" #include "skateboard.h"
#include "InfocenterState.h" #include "helicopter.h"
#include "PoliceState.h" #include "helicopterstate.h"
#include "GasStationState.h" #include "dunebuggy.h"
#include "SkateBoard.h" #include "pizza.h"
#include "Helicopter.h" #include "pizzamissionstate.h"
#include "HelicopterState.h" //#include "act2actor.h"
#include "DuneBuggy.h" #include "act2brick.h"
#include "Pizza.h" //#include "act2genactor.h"
#include "PizzaMissionState.h" #include "act2policestation.h"
//#include "Act2Actor.h" #include "act3.h"
#include "Act2Brick.h" #include "act3state.h"
//#include "Act2GenActor.h" #include "doors.h"
#include "Act2PoliceStation.h" #include "legoanimmmpresenter.h"
#include "Act3.h" #include "racecar.h"
#include "Act3State.h" #include "jetski.h"
#include "Doors.h" #include "bike.h"
#include "LegoAnimMMPresenter.h" #include "motorcycle.h"
#include "RaceCar.h" #include "ambulance.h"
#include "Jetski.h" #include "ambulancemissionstate.h"
#include "Bike.h" #include "towtrack.h"
#include "Motorcycle.h" #include "towtrackmissionstate.h"
#include "Ambulance.h" //#include "act3cop.h"
#include "AmbulanceMissionState.h" //#include "act3brickster.h"
#include "TowTrack.h" #include "act3shark.h"
#include "TowTrackMissionState.h" #include "bumpbouy.h"
//#include "Act3Cop.h" #include "act3actor.h"
//#include "Act3Brickster.h" #include "jetskiracestate.h"
#include "Act3Shark.h" #include "carracestate.h"
#include "BumpBouy.h" #include "act1state.h"
#include "Act3Actor.h" #include "pizzeria.h"
#include "JetskiRaceState.h" #include "pizzeriastate.h"
#include "CarRaceState.h" #include "infocenterentity.h"
#include "Act1State.h" #include "hospitalentity.h"
#include "Pizzeria.h" #include "gasstationentity.h"
#include "PizzeriaState.h" #include "policeentity.h"
#include "InfoCenterEntity.h" #include "beachhouseentity.h"
#include "HospitalEntity.h" #include "racestandsentity.h"
#include "GasStationEntity.h" #include "jukeboxentity.h"
#include "PoliceEntity.h" #include "radiostate.h"
#include "BeachHouseEntity.h" //#include "caveentity.h"
#include "RaceStandsEntity.h" //#include "jailentity.h"
#include "JukeBoxEntity.h" #include "mxcompositemediapresenter.h"
#include "RadioState.h" #include "jukebox.h"
//#include "CaveEntity.h" #include "jukeboxstate.h"
//#include "JailEntity.h" //#include "raceskel.h"
#include "MxCompositeMediaPresenter.h" #include "animstate.h"
#include "Jukebox.h"
#include "JukeBoxState.h"
//#include "RaceSkel.h" // TODO: Before HospitalState, add all of the different LegoVehicleBuildState's
#include "AnimState.h"
// TODO: Uncomment once we have all the relevant types ready // TODO: Uncomment once we have all the relevant types ready
// DECOMP_SIZE_ASSERT(LegoObjectFactory, 0x1c8); // DECOMP_SIZE_ASSERT(LegoObjectFactory, 0x1c8);

28
LEGO1/legoobjectfactory.h
View File

@ -26,9 +26,9 @@
X(Lego3DWavePresenter) \ X(Lego3DWavePresenter) \
X(LegoActor) \ X(LegoActor) \
X(LegoPathActor) \ X(LegoPathActor) \
X(LegoRaceCar) \ X(LegoRaceCar) \
X(LegoJetski) \ X(LegoJetski) \
X(JetskiRace) \ /*X(JetskiRace) \*/ \
X(LegoEntity) \ X(LegoEntity) \
X(LegoCarRaceActor) \ X(LegoCarRaceActor) \
X(LegoJetskiRaceActor) \ X(LegoJetskiRaceActor) \
@ -48,11 +48,7 @@
X(GasStation) \ X(GasStation) \
X(LegoAct2) \ X(LegoAct2) \
X(LegoAct2State) \ X(LegoAct2State) \
X(CarRace) \ /*X(CarRace)*/ \
X(LegoRaceCarBuildState) \
X(LegoCopterBuildState) \
X(LegoDuneCarBuildState) \
X(LegoJetskiBuildState) \
X(HospitalState) \ X(HospitalState) \
X(InfocenterState) \ X(InfocenterState) \
X(PoliceState) \ X(PoliceState) \
@ -63,9 +59,9 @@
X(DuneBuggy) \ X(DuneBuggy) \
X(Pizza) \ X(Pizza) \
X(PizzaMissionState) \ X(PizzaMissionState) \
X(Act2Actor) \ /*X(Act2Actor)*/ \
X(Act2Brick) \ /*X(Act2Brick)*/ \
X(Act2GenActor) \ /*X(Act2GenActor)*/ \
X(Act2PoliceStation) \ X(Act2PoliceStation) \
X(Act3) \ X(Act3) \
X(Act3State) \ X(Act3State) \
@ -79,8 +75,8 @@
X(AmbulanceMissionState) \ X(AmbulanceMissionState) \
X(TowTrack) \ X(TowTrack) \
X(TowTrackMissionState) \ X(TowTrackMissionState) \
X(Act3Cop) \ /*X(Act3Cop)*/ \
X(Act3Brickster) \ /*X(Act3Brickster)*/ \
X(Act3Shark) \ X(Act3Shark) \
X(BumpBouy) \ X(BumpBouy) \
X(Act3Actor) \ X(Act3Actor) \
@ -97,12 +93,12 @@
X(RaceStandsEntity) \ X(RaceStandsEntity) \
X(JukeBoxEntity) \ X(JukeBoxEntity) \
X(RadioState) \ X(RadioState) \
X(CaveEntity) \ /*X(CaveEntity)*/ \
X(JailEntity) \ /*X(JailEntity)*/ \
X(MxCompositeMediaPresenter) \ X(MxCompositeMediaPresenter) \
X(Jukebox) \ X(JukeBox) \
X(JukeBoxState) \ X(JukeBoxState) \
X(RaceSkel) \ /*X(RaceSkel)*/ \
X(AnimState) X(AnimState)
// VTABLE: LEGO1 0x100d4768 // VTABLE: LEGO1 0x100d4768

25
LEGO1/legoracecar.h Normal file
View File

@ -0,0 +1,25 @@
#ifndef LEGOCARRACE_H
#define LEGOCARRACE_H
#include "legopathactor.h"
#include "legocarraceactor.h"
// VTABLE: LEGO1 0x100d58b8
// SIZE: 0x200
class LegoRaceCar : public LegoCarRaceActor {
public:
// FUNCTION: LEGO1 0x10014290
inline const char* ClassName() const override // vtable+0xc
{
// GLOBAL: LEGO1 0x100f0bf4
return "LegoRaceCar";
}
// FUNCTION: LEGO1 0x100142b0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
}
};
#endif // LEGOCARRACE_H

6
LEGO1/pizzeria.h
View File

@ -1,5 +1,5 @@
#ifndef PIZZERIASTATE_H #ifndef PIZZERIA_H
#define PIZZERIASTATE_H #define PIZZERIA_H
#include "isleactor.h" #include "isleactor.h"
@ -21,4 +21,4 @@ class Pizzeria : public IsleActor {
} }
}; };
#endif // PIZZERIASTATE_H #endif // PIZZERIA_H