isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-23 08:08:03 -05:00
Code Issues Projects Releases Packages Wiki Activity
isle/LEGO1/lego/legoomni/include/legoobjectfactory.h

124 lines
12 KiB
C
Raw Normal View History

100% match of many functions in the LegoGameState::Save codepath (#86) * Only include decomps * One more function * Add offset to endOfVariables * Remove leftover header * Use undefined where applicable * Fixes, refactorings * Fixes * Fix calling convention * Added offset comment --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2023-10-12 12:18:24 -04:00
#ifndef LEGOOBJECTFACTORY_H
#define LEGOOBJECTFACTORY_H
#include "mxobjectfactory.h"
Add most of LegoObjectFactory (#365) * push changes * push changes * fix * Update legoracecar.h
2023-12-26 18:10:28 -05:00
#define FOR_LEGOOBJECTFACTORY_OBJECTS(X) \
X(LegoEntityPresenter) \
X(LegoActorPresenter) \
X(LegoWorldPresenter) \
X(LegoWorld) \
Add JetSkiRace vtable and CaveEntity classes from LegoObjectFactory (#553) * Add JetSkiRace vtable * Fix vtable * Fixes * Update jetskirace.cpp --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-02-10 18:44:00 -05:00
X(LegoAnimPresenter) \
X(LegoModelPresenter) \
X(LegoTexturePresenter) \
X(LegoPhonemePresenter) \
X(LegoFlcTexturePresenter) \
Add most of LegoObjectFactory (#365) * push changes * push changes * fix * Update legoracecar.h
2023-12-26 18:10:28 -05:00
X(LegoPalettePresenter) \
X(LegoPathPresenter) \
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) \
Add JetSkiRace vtable and CaveEntity classes from LegoObjectFactory (#553) * Add JetSkiRace vtable * Fix vtable * Fixes * Update jetskirace.cpp --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-02-10 18:44:00 -05:00
X(JetskiRace) \
Add most of LegoObjectFactory (#365) * push changes * push changes * fix * Update legoracecar.h
2023-12-26 18:10:28 -05:00
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) \
Add JetSkiRace vtable and CaveEntity classes from LegoObjectFactory (#553) * Add JetSkiRace vtable * Fix vtable * Fixes * Update jetskirace.cpp --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-02-10 18:44:00 -05:00
X(CarRace) \
Add most of LegoObjectFactory (#365) * push changes * push changes * fix * Update legoracecar.h
2023-12-26 18:10:28 -05:00
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) \
Fix wrong class name (#438) * push changes * fix * rename file
2024-01-14 17:00:03 -05:00
X(Motocycle) \
Add most of LegoObjectFactory (#365) * push changes * push changes * fix * Update legoracecar.h
2023-12-26 18:10:28 -05:00
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) \
Add JetSkiRace vtable and CaveEntity classes from LegoObjectFactory (#553) * Add JetSkiRace vtable * Fix vtable * Fixes * Update jetskirace.cpp --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-02-10 18:44:00 -05:00
X(CaveEntity) \
Add most of LegoObjectFactory (#365) * push changes * push changes * fix * Update legoracecar.h
2023-12-26 18:10:28 -05:00
/*X(JailEntity)*/ \
X(MxCompositeMediaPresenter) \
X(JukeBox) \
X(JukeBoxState) \
/*X(RaceSkel)*/ \
X(AnimState)
100% match of many functions in the LegoGameState::Save codepath (#86) * Only include decomps * One more function * Add offset to endOfVariables * Remove leftover header * Use undefined where applicable * Fixes, refactorings * Fixes * Fix calling convention * Added offset comment --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2023-10-12 12:18:24 -04:00
(Proposal) Adjustments to "decomp" language (#308) * Adjustments to "decomp" language * Fix a comment * Fix accidental clang-formatting * Fix order * Fix order * Remove junk * Fix OFFSET * Adjustments based on new suggestions * Annotate globals * Globals in ISLE * More globals * Merge from parser2 branch * Allow prepending space for exact marker match * To eliminate noise, require the 0x prefix on offset for marker match * fix test from previous * Count tab stops for indented functions to reduce MISSED_END_OF_FUNCTION noise * FUNCTION to SYNTHETIC where needed * Missed marker conversion on SetAtomId * pylint cleanup, remove unused code * Fix unexpected function end, add more unit tests * Be more strict about synthetic name syntax * Revert "Missed marker conversion on SetAtomId" This reverts commit d87d665127fae7dd6e5bd48d9af14a0a829bf9e2. * Revert "FUNCTION to SYNTHETIC where needed" This reverts commit 8c815418d261ba8c5f67a9a2cae349fe4ac92db8. * Implicit lookup by name for functions * Fix VTABLE SYNTHETIC and other decomp markers * Get vtable class name * Vtable marker should identify struct * No colon for SIZE comment * Update README.md * Update README.md * Update CONTRIBUTING.md * Update README.md * Update README.md * Update CONTRIBUTING.md * Update README.md * Update CONTRIBUTING.md * Fix destructor/annotation * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md --------- Co-authored-by: disinvite <disinvite@users.noreply.github.com>
2023-12-06 07:10:45 -05:00
// VTABLE: LEGO1 0x100d4768
Introduce clang-format (#240)
2023-10-24 19:38:27 -04:00
class LegoObjectFactory : public MxObjectFactory {
100% match of many functions in the LegoGameState::Save codepath (#86) * Only include decomps * One more function * Add offset to endOfVariables * Remove leftover header * Use undefined where applicable * Fixes, refactorings * Fixes * Fix calling convention * Added offset comment --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2023-10-12 12:18:24 -04:00
public:
Introduce clang-format (#240)
2023-10-24 19:38:27 -04:00
LegoObjectFactory();
cmake+ci: run clang-tidy (#512) * cmake+ci: run clang-tidy * Remove DESCRIPTION from LEGO1/LegoOmni.mingw.def * Add initial .clang-tidy and fixes * fix file perms * Comment out DESCRIPTION * Remove LegoEntity::~LegoEntity and MxPresenter::~MxPresenter from mingw's LEGO1.def * Looks like clang is allergic to the libs in the directx5 SDK * Update .clang-tidy * Fix typo in .clang-tidy * Attempt to generate an action error * Revert "Attempt to generate an action error" This reverts commit 96c4c65fedbc4102837f4bcbbb9ee83a7d14cba3. * cmake: test with -Wparentheses + optionally with -Werror * ci: -k0 is a Ninja argument * Use -Werror only for msys2 builds * cmake: only emit warnings for specific warnings * cmake: and don't do -Werror/-WX anymore * Fix warnings * Fix mingw warnings --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-02-01 15:42:10 -05:00
MxCore* Create(const char* p_name) override; // vtable 0x14
void Destroy(MxCore* p_object) override; // vtable 0x18
(clang-format) Add EmptyLineBeforeAccessModifier (#300)
2023-11-24 12:10:09 -05:00
reccmp: vtable comparison (#452) * Add vtable comparison to reccmp * Add missing scalar deleting destructors * Fix some vtables --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-01-18 08:34:14 -05:00
// SYNTHETIC: LEGO1 0x10009000
// LegoObjectFactory::`scalar deleting destructor'
Match more scalar deleting destructors (#568)
2024-02-16 13:15:53 -05:00
// SYNTHETIC: LEGO1 0x10009170
// LegoObjectFactory::~LegoObjectFactory
100% match of many functions in the LegoGameState::Save codepath (#86) * Only include decomps * One more function * Add offset to endOfVariables * Remove leftover header * Use undefined where applicable * Fixes, refactorings * Fixes * Fix calling convention * Added offset comment --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2023-10-12 12:18:24 -04:00
private:
#define X(V) MxAtomId m_id##V;
Introduce clang-format (#240)
2023-10-24 19:38:27 -04:00
FOR_LEGOOBJECTFACTORY_OBJECTS(X)
100% match of many functions in the LegoGameState::Save codepath (#86) * Only include decomps * One more function * Add offset to endOfVariables * Remove leftover header * Use undefined where applicable * Fixes, refactorings * Fixes * Fix calling convention * Added offset comment --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2023-10-12 12:18:24 -04:00
#undef X
};
#endif // LEGOOBJECTFACTORY_H
Reference in a new issue Copy permalink