push changes

This commit is contained in:
Misha 2023-12-26 14:42:53 -05:00
parent 17522b98d4
commit 45bf4eece2
No known key found for this signature in database
GPG Key ID: 8441D12AEF33FED8
2 changed files with 201 additions and 2 deletions

View File

@ -1,7 +1,106 @@
#include "legoobjectfactory.h"
#include "decomp.h"
#include "infocenterstate.h"
#include "LegoModelPresenter.h"
#include "LegoTexturePresenter.h"
#include "LegoPhonemePresenter.h"
#include "LegoFlcTexturePresenter.h"
#include "LegoEntityPresenter.h"
#include "LegoActorPresenter.h"
#include "LegoWorldPresenter.h"
#include "LegoWorld.h"
#include "LegoPalettePresenter.h"
#include "LegoPathPresenter.h"
#include "LegoAnimPresenter.h"
#include "LegoLoopingAnimPresenter.h"
#include "LegoLocomotionAnimPresenter.h"
#include "LegoHideAnimPresenter.h"
#include "LegoPartPresenter.h"
#include "LegoCarBuildAnimPresenter.h"
#include "LegoActionControlPresenter.h"
#include "MxVideoPresenter.h"
#include "LegoLoadCacheSoundPresenter.h"
#include "Lego3DWavePresenter.h"
#include "LegoActor.h"
#include "LegoPathActor.h"
//#include "LegoRaceCar.h"
#include "LegoJetski.h"
#include "JetskiRace.h"
#include "LegoEntity.h"
#include "LegoCarRaceActor.h"
#include "LegoJetskiRaceActor.h"
#include "LegoCarBuild.h"
#include "Infocenter.h"
#include "LegoAnimActor.h"
#include "MxControlPresenter.h"
#include "RegistrationBook.h"
#include "HistoryBook.h"
#include "ElevatorBottom.h"
#include "InfocenterDoor.h"
#include "Score.h"
#include "ScoreState.h"
#include "Hospital.h"
#include "Isle.h"
#include "Police.h"
#include "GasStation.h"
//#include "LegoAct2.h"
#include "LegoAct2State.h"
#include "CarRace.h"
//#include "LegoRaceCarBuildState.h"
//#include "LegoCopterBuildState.h"
//#include "LegoDuneCarBuildState.h"
//#include "LegoJetskiBuildState.h"
#include "HospitalState.h"
#include "InfocenterState.h"
#include "PoliceState.h"
#include "GasStationState.h"
#include "SkateBoard.h"
#include "Helicopter.h"
#include "HelicopterState.h"
#include "DuneBuggy.h"
#include "Pizza.h"
#include "PizzaMissionState.h"
//#include "Act2Actor.h"
#include "Act2Brick.h"
//#include "Act2GenActor.h"
#include "Act2PoliceStation.h"
#include "Act3.h"
#include "Act3State.h"
#include "Doors.h"
#include "LegoAnimMMPresenter.h"
#include "RaceCar.h"
#include "Jetski.h"
#include "Bike.h"
#include "Motorcycle.h"
#include "Ambulance.h"
#include "AmbulanceMissionState.h"
#include "TowTrack.h"
#include "TowTrackMissionState.h"
//#include "Act3Cop.h"
//#include "Act3Brickster.h"
#include "Act3Shark.h"
#include "BumpBouy.h"
#include "Act3Actor.h"
#include "JetskiRaceState.h"
#include "CarRaceState.h"
#include "Act1State.h"
#include "Pizzeria.h"
#include "PizzeriaState.h"
#include "InfoCenterEntity.h"
#include "HospitalEntity.h"
#include "GasStationEntity.h"
#include "PoliceEntity.h"
#include "BeachHouseEntity.h"
#include "RaceStandsEntity.h"
#include "JukeBoxEntity.h"
#include "RadioState.h"
//#include "CaveEntity.h"
//#include "JailEntity.h"
#include "MxCompositeMediaPresenter.h"
#include "Jukebox.h"
#include "JukeBoxState.h"
//#include "RaceSkel.h"
#include "AnimState.h"
// TODO: Uncomment once we have all the relevant types ready
// DECOMP_SIZE_ASSERT(LegoObjectFactory, 0x1c8);

View File

@ -3,7 +3,107 @@
#include "mxobjectfactory.h"
#define FOR_LEGOOBJECTFACTORY_OBJECTS(X) X(InfocenterState)
#define FOR_LEGOOBJECTFACTORY_OBJECTS(X) \
X(LegoModelPresenter) \
X(LegoTexturePresenter) \
X(LegoPhonemePresenter) \
X(LegoFlcTexturePresenter) \
X(LegoEntityPresenter) \
X(LegoActorPresenter) \
X(LegoWorldPresenter) \
X(LegoWorld) \
X(LegoPalettePresenter) \
X(LegoPathPresenter) \
X(LegoAnimPresenter) \
X(LegoLoopingAnimPresenter) \
X(LegoLocomotionAnimPresenter) \
X(LegoHideAnimPresenter) \
X(LegoPartPresenter) \
X(LegoCarBuildAnimPresenter) \
X(LegoActionControlPresenter) \
X(MxVideoPresenter) \
X(LegoLoadCacheSoundPresenter) \
X(Lego3DWavePresenter) \
X(LegoActor) \
X(LegoPathActor) \
X(LegoRaceCar) \
X(LegoJetski) \
X(JetskiRace) \
X(LegoEntity) \
X(LegoCarRaceActor) \
X(LegoJetskiRaceActor) \
X(LegoCarBuild) \
X(Infocenter) \
X(LegoAnimActor) \
X(MxControlPresenter) \
X(RegistrationBook) \
X(HistoryBook) \
X(ElevatorBottom) \
X(InfocenterDoor) \
X(Score) \
X(ScoreState) \
X(Hospital) \
X(Isle) \
X(Police) \
X(GasStation) \
X(LegoAct2) \
X(LegoAct2State) \
X(CarRace) \
X(LegoRaceCarBuildState) \
X(LegoCopterBuildState) \
X(LegoDuneCarBuildState) \
X(LegoJetskiBuildState) \
X(HospitalState) \
X(InfocenterState) \
X(PoliceState) \
X(GasStationState) \
X(SkateBoard) \
X(Helicopter) \
X(HelicopterState) \
X(DuneBuggy) \
X(Pizza) \
X(PizzaMissionState) \
X(Act2Actor) \
X(Act2Brick) \
X(Act2GenActor) \
X(Act2PoliceStation) \
X(Act3) \
X(Act3State) \
X(Doors) \
X(LegoAnimMMPresenter) \
X(RaceCar) \
X(Jetski) \
X(Bike) \
X(Motorcycle) \
X(Ambulance) \
X(AmbulanceMissionState) \
X(TowTrack) \
X(TowTrackMissionState) \
X(Act3Cop) \
X(Act3Brickster) \
X(Act3Shark) \
X(BumpBouy) \
X(Act3Actor) \
X(JetskiRaceState) \
X(CarRaceState) \
X(Act1State) \
X(Pizzeria) \
X(PizzeriaState) \
X(InfoCenterEntity) \
X(HospitalEntity) \
X(GasStationEntity) \
X(PoliceEntity) \
X(BeachHouseEntity) \
X(RaceStandsEntity) \
X(JukeBoxEntity) \
X(RadioState) \
X(CaveEntity) \
X(JailEntity) \
X(MxCompositeMediaPresenter) \
X(Jukebox) \
X(JukeBoxState) \
X(RaceSkel) \
X(AnimState)
// VTABLE: LEGO1 0x100d4768
class LegoObjectFactory : public MxObjectFactory {