From 3f3bc0e34349ff8681ddc6068a790e0ad1be3f70 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 7 Jan 2024 14:22:40 -0500 Subject: [PATCH] Reorganize sources --- CMakeLists.txt | 408 +++++++++--------- LEGO1/buildingentity.cpp | 13 - LEGO1/buildingentity.h | 27 -- LEGO1/dunebuggy.cpp | 12 - LEGO1/dunebuggy.h | 33 -- LEGO1/helicopter.cpp | 370 ---------------- LEGO1/helicopter.h | 63 --- LEGO1/helicopterstate.cpp | 1 - LEGO1/helicopterstate.h | 31 -- LEGO1/jetski.cpp | 11 - LEGO1/jetski.h | 31 -- LEGO1/{ => lego/legoomni/include}/extra.h | 0 .../{ => lego/legoomni/include}/gifmanager.h | 0 .../legoomni/include}/lego3dwavepresenter.h | 0 .../include}/legoactioncontrolpresenter.h | 0 LEGO1/{ => lego/legoomni/include}/legoactor.h | 0 .../legoomni/include}/legoactorpresenter.h | 0 .../legoomni/include}/legoanimactor.h | 0 .../legoomni/include}/legoanimationmanager.h | 0 .../legoomni/include}/legoanimmmpresenter.h | 0 .../legoomni/include}/legoanimpresenter.h | 0 .../legoomni/include}/legobackgroundcolor.h | 0 .../legoomni/include}/legobuildingmanager.h | 0 .../legoomni/include}/legocachesound.h | 0 .../legoomni/include}/legocameracontroller.h | 0 .../legoomni/include}/legocarbuild.h | 0 .../include}/legocarbuildanimpresenter.h | 0 .../legoomni/include}/legocarraceactor.h | 0 .../legoomni/include}/legocontrolmanager.h | 0 .../{ => lego/legoomni/include}/legoentity.h | 2 +- .../legoomni/include}/legoentitypresenter.h | 0 .../include}/legoeventnotificationparam.h | 0 .../legoomni/include}/legoextraactor.h | 0 .../include}/legoflctexturepresenter.h | 0 .../legoomni/include}/legofullscreenmovie.h | 0 .../legoomni/include}/legogamestate.h | 0 .../legoomni/include}/legohideanimpresenter.h | 0 .../legoomni/include}/legoinputmanager.h | 0 .../{ => lego/legoomni/include}/legojetski.h | 0 .../legoomni/include}/legojetskiraceactor.h | 0 .../include}/legoloadcachesoundpresenter.h | 0 .../include}/legolocomotionanimpresenter.h | 0 .../include}/legoloopinganimpresenter.h | 0 .../legoomni/include}/legometerpresenter.h | 0 .../legoomni/include}/legomodelpresenter.h | 0 .../legoomni/include}/legonavcontroller.h | 0 .../legoomni/include}/legoobjectfactory.h | 0 LEGO1/{ => lego/legoomni/include}/legoomni.h | 0 .../legoomni/include}/legopalettepresenter.h | 0 .../legoomni/include}/legopartpresenter.h | 0 .../legoomni/include}/legopathactor.h | 0 .../legoomni/include}/legopathboundary.h | 0 .../legoomni/include}/legopathcontroller.h | 0 .../include}/legopathcontrollerlist.h | 0 .../legoomni/include}/legopathpresenter.h | 0 .../legoomni/include}/legophonemepresenter.h | 0 .../legoomni/include}/legoplantmanager.h | 0 LEGO1/{ => lego/legoomni/include}/legorace.h | 0 .../legoomni/include}/legoraceactor.h | 0 .../{ => lego/legoomni/include}/legoracecar.h | 0 .../legoomni/include}/legosoundmanager.h | 0 LEGO1/{ => lego/legoomni/include}/legostate.h | 0 .../{ => lego/legoomni/include}/legostream.h | 0 .../legoomni/include}/legotexturepresenter.h | 0 .../legoomni/include/legounknown100d7c88.h} | 10 +- .../legoomni/include/legounknown100d9d00.h | 42 ++ .../legoomni/include}/legounksavedatawriter.h | 0 LEGO1/{ => lego/legoomni/include}/legoutil.h | 0 .../legoomni/include}/legovehiclebuildstate.h | 0 .../legoomni/include}/legovideomanager.h | 70 +-- LEGO1/{ => lego/legoomni/include}/legoworld.h | 0 .../legoomni/include}/legoworldlist.h | 0 .../legoomni/include}/legoworldpresenter.h | 0 .../legoomni/src/audio}/legocachesound.cpp | 0 .../audio}/legoloadcachesoundpresenter.cpp | 0 .../legoomni/src/audio}/legosoundmanager.cpp | 0 .../legoomni/src/common}/gifmanager.cpp | 0 .../common}/legoactioncontrolpresenter.cpp | 0 .../src/common}/legobackgroundcolor.cpp | 0 .../src/common}/legocameracontroller.cpp | 0 .../src/common}/legofullscreenmovie.cpp | 0 .../legoomni/src/common}/legogamestate.cpp | 0 .../src/common}/legonavcontroller.cpp | 0 .../src/common}/legoobjectfactory.cpp | 0 .../legoomni/src/common}/legoplantmanager.cpp | 0 .../legoomni/src/common}/legostate.cpp | 0 .../legoomni/src/common}/legostream.cpp | 0 .../src/common}/legounksavedatawriter.cpp | 0 .../legoomni/src/common}/legoutil.cpp | 0 .../src/control}/legocontrolmanager.cpp | 0 .../legoomni/src/entity}/legoactor.cpp | 0 .../legoomni/src/entity}/legoanimactor.cpp | 0 .../legoomni/src/entity}/legoentity.cpp | 0 .../src/entity}/legoentitypresenter.cpp | 0 .../legoomni/src/entity}/legojetski.cpp | 0 .../legoomni/src/entity}/legopathactor.cpp | 0 .../legoomni/src/entity}/legorace.cpp | 0 .../legoomni/src/entity}/legoworld.cpp | 0 .../src/entity}/legoworldpresenter.cpp | 0 .../legoomni/src/input}/legoinputmanager.cpp | 0 .../{ => lego/legoomni/src/main}/legoomni.cpp | 0 .../notify}/legoeventnotificationparam.cpp | 0 .../src/paths}/legopathcontroller.cpp | 0 .../legoomni/src/paths}/legopathpresenter.cpp | 0 .../src/unknown/legounknown100d7c88.cpp | 12 + .../src/video}/legoanimationmanager.cpp | 0 .../src/video}/legoanimmmpresenter.cpp | 0 .../legoomni/src/video}/legoanimpresenter.cpp | 0 .../src/video}/legocarbuildanimpresenter.cpp | 0 .../src/video}/legoflctexturepresenter.cpp | 0 .../src/video}/legohideanimpresenter.cpp | 0 .../video}/legolocomotionanimpresenter.cpp | 0 .../src/video}/legometerpresenter.cpp | 0 .../src/video}/legomodelpresenter.cpp | 0 .../src/video}/legopalettepresenter.cpp | 0 .../legoomni/src/video}/legopartpresenter.cpp | 0 .../src/video}/legophonemepresenter.cpp | 0 .../src/video}/legotexturepresenter.cpp | 0 .../legoomni/src/video}/legovideomanager.cpp | 2 +- LEGO1/{ => lego/scripts/act1}/act1state.cpp | 0 LEGO1/{ => lego/scripts/act1}/act1state.h | 0 LEGO1/{ => lego/scripts/act2}/act2brick.cpp | 0 LEGO1/{ => lego/scripts/act2}/act2brick.h | 0 .../scripts/act2}/act2policestation.cpp | 0 .../scripts/act2}/act2policestation.h | 0 LEGO1/{ => lego/scripts/act2}/legoact2.h | 0 .../{ => lego/scripts/act2}/legoact2state.cpp | 0 LEGO1/{ => lego/scripts/act2}/legoact2state.h | 0 LEGO1/{ => lego/scripts/act3}/act3.cpp | 0 LEGO1/{ => lego/scripts/act3}/act3.h | 0 LEGO1/{ => lego/scripts/act3}/act3actor.h | 0 LEGO1/{ => lego/scripts/act3}/act3shark.cpp | 0 LEGO1/{ => lego/scripts/act3}/act3shark.h | 0 LEGO1/{ => lego/scripts/act3}/act3state.cpp | 0 LEGO1/{ => lego/scripts/act3}/act3state.h | 0 .../scripts/gasstation}/gasstation.cpp | 0 .../scripts/gasstation}/gasstation.h | 0 .../scripts/gasstation}/gasstationentity.cpp | 0 .../scripts/gasstation}/gasstationentity.h | 0 .../scripts/gasstation}/gasstationstate.cpp | 0 .../scripts/gasstation}/gasstationstate.h | 0 .../{ => lego/scripts/hospital}/ambulance.cpp | 0 LEGO1/{ => lego/scripts/hospital}/ambulance.h | 0 .../hospital}/ambulancemissionstate.cpp | 0 .../scripts/hospital}/ambulancemissionstate.h | 0 .../{ => lego/scripts/hospital}/hospital.cpp | 0 LEGO1/{ => lego/scripts/hospital}/hospital.h | 0 .../scripts/hospital}/hospitalentity.cpp | 0 .../scripts/hospital}/hospitalentity.h | 0 .../scripts/hospital}/hospitalstate.cpp | 0 .../scripts/hospital}/hospitalstate.h | 0 .../scripts/infocenter}/elevatorbottom.cpp | 0 .../scripts/infocenter}/elevatorbottom.h | 0 .../scripts/infocenter}/infocenter.cpp | 0 .../scripts/infocenter}/infocenter.h | 0 .../scripts/infocenter}/infocenterdoor.cpp | 0 .../scripts/infocenter}/infocenterdoor.h | 0 .../scripts/infocenter}/infocenterentity.cpp | 0 .../scripts/infocenter}/infocenterentity.h | 0 .../scripts/infocenter}/infocenterstate.cpp | 0 .../scripts/infocenter}/infocenterstate.h | 0 .../scripts/infocenter}/registrationbook.cpp | 0 .../scripts/infocenter}/registrationbook.h | 0 LEGO1/{ => lego/scripts/infocenter}/score.cpp | 0 LEGO1/{ => lego/scripts/infocenter}/score.h | 0 .../scripts/infocenter}/scorestate.cpp | 0 .../scripts/infocenter}/scorestate.h | 0 LEGO1/{ => lego/scripts/isle}/animstate.cpp | 0 LEGO1/{ => lego/scripts/isle}/animstate.h | 0 .../scripts/isle}/beachhouseentity.cpp | 0 .../scripts/isle}/beachhouseentity.h | 0 LEGO1/{ => lego/scripts/isle}/bike.cpp | 0 LEGO1/{ => lego/scripts/isle}/bike.h | 0 LEGO1/{ => lego/scripts/isle}/bumpbouy.cpp | 0 LEGO1/{ => lego/scripts/isle}/bumpbouy.h | 0 LEGO1/{ => lego/scripts/isle}/doors.h | 0 LEGO1/{ => lego/scripts/isle}/historybook.cpp | 0 LEGO1/{ => lego/scripts/isle}/historybook.h | 0 LEGO1/{ => lego/scripts/isle}/isle.cpp | 0 LEGO1/{ => lego/scripts/isle}/isle.h | 0 LEGO1/{ => lego/scripts/isle}/isleactor.cpp | 0 LEGO1/{ => lego/scripts/isle}/isleactor.h | 0 .../{ => lego/scripts/isle}/islepathactor.cpp | 0 LEGO1/{ => lego/scripts/isle}/islepathactor.h | 0 LEGO1/{ => lego/scripts/isle}/jukebox.cpp | 0 LEGO1/{ => lego/scripts/isle}/jukebox.h | 0 .../{ => lego/scripts/isle}/jukeboxentity.cpp | 0 LEGO1/{ => lego/scripts/isle}/jukeboxentity.h | 0 .../{ => lego/scripts/isle}/jukeboxstate.cpp | 0 LEGO1/{ => lego/scripts/isle}/jukeboxstate.h | 0 LEGO1/{ => lego/scripts/isle}/motorcycle.cpp | 0 LEGO1/{ => lego/scripts/isle}/motorcycle.h | 0 LEGO1/{ => lego/scripts/isle}/radio.cpp | 0 LEGO1/{ => lego/scripts/isle}/radio.h | 0 LEGO1/{ => lego/scripts/isle}/radiostate.cpp | 0 LEGO1/{ => lego/scripts/isle}/radiostate.h | 0 LEGO1/{ => lego/scripts/isle}/skateboard.cpp | 0 LEGO1/{ => lego/scripts/isle}/skateboard.h | 0 LEGO1/{ => lego/scripts/pizzeria}/pizza.cpp | 0 LEGO1/{ => lego/scripts/pizzeria}/pizza.h | 0 .../scripts/pizzeria}/pizzamissionstate.cpp | 0 .../scripts/pizzeria}/pizzamissionstate.h | 0 .../{ => lego/scripts/pizzeria}/pizzeria.cpp | 0 LEGO1/{ => lego/scripts/pizzeria}/pizzeria.h | 0 .../scripts/pizzeria}/pizzeriastate.cpp | 0 .../scripts/pizzeria}/pizzeriastate.h | 0 LEGO1/{ => lego/scripts/police}/police.cpp | 0 LEGO1/{ => lego/scripts/police}/police.h | 0 .../scripts/police}/policeentity.cpp | 0 .../{ => lego/scripts/police}/policeentity.h | 0 .../{ => lego/scripts/police}/policestate.cpp | 0 LEGO1/{ => lego/scripts/police}/policestate.h | 0 LEGO1/{ => lego/scripts/race}/carrace.cpp | 0 LEGO1/{ => lego/scripts/race}/carrace.h | 0 LEGO1/{ => lego/scripts/race}/carracestate.h | 0 LEGO1/{ => lego/scripts/race}/jetskirace.cpp | 0 LEGO1/{ => lego/scripts/race}/jetskirace.h | 0 .../{ => lego/scripts/race}/jetskiracestate.h | 0 .../scripts/race}/racestandsentity.cpp | 0 .../scripts/race}/racestandsentity.h | 0 LEGO1/{ => lego/scripts/race}/racestate.cpp | 0 LEGO1/{ => lego/scripts/race}/racestate.h | 0 .../{ => lego/scripts/towtrack}/towtrack.cpp | 0 LEGO1/{ => lego/scripts/towtrack}/towtrack.h | 0 .../towtrack}/towtrackmissionstate.cpp | 0 .../scripts/towtrack}/towtrackmissionstate.h | 0 .../sources}/3dmanager/lego3dmanager.cpp | 0 .../sources}/3dmanager/lego3dmanager.h | 0 .../sources}/3dmanager/lego3dview.cpp | 0 .../{ => lego/sources}/3dmanager/lego3dview.h | 0 .../sources}/3dmanager/legoview1.cpp | 0 .../{ => lego/sources}/3dmanager/legoview1.h | 0 .../sources}/3dmanager/tglsurface.cpp | 0 .../{ => lego/sources}/3dmanager/tglsurface.h | 4 +- LEGO1/{ => lego/sources/roi}/legoroi.cpp | 0 LEGO1/{ => lego/sources/roi}/legoroi.h | 0 LEGO1/legobuildingmanager.cpp | 28 -- LEGO1/legocarbuild.cpp | 29 -- LEGO1/legovehiclebuildstate.cpp | 25 -- LEGO1/mxparam.cpp | 1 - LEGO1/mxunknown100d7c88.cpp | 12 - LEGO1/mxunknown100d9d00.h | 42 -- .../include}/mxactionnotificationparam.h | 0 LEGO1/{ => omni/include}/mxatomid.h | 0 LEGO1/{ => omni/include}/mxatomidcounter.h | 0 LEGO1/{ => omni/include}/mxaudiomanager.h | 0 LEGO1/{ => omni/include}/mxaudiopresenter.h | 0 LEGO1/{ => omni/include}/mxautolocker.h | 0 .../include}/mxbackgroundaudiomanager.h | 0 LEGO1/{ => omni/include}/mxbitmap.h | 0 LEGO1/{ => omni/include}/mxcollection.h | 0 .../include}/mxcompositemediapresenter.h | 0 .../{ => omni/include}/mxcompositepresenter.h | 0 LEGO1/{ => omni/include}/mxcontrolpresenter.h | 0 LEGO1/{ => omni/include}/mxcore.h | 0 LEGO1/{ => omni/include}/mxcriticalsection.h | 0 .../include}/mxdiskstreamcontroller.h | 0 .../{ => omni/include}/mxdiskstreamprovider.h | 0 LEGO1/{ => omni/include}/mxdisplaysurface.h | 0 LEGO1/{ => omni/include}/mxdsaction.h | 0 LEGO1/{ => omni/include}/mxdsactionlist.h | 0 LEGO1/{ => omni/include}/mxdsanim.h | 0 LEGO1/{ => omni/include}/mxdsbuffer.h | 0 LEGO1/{ => omni/include}/mxdschunk.h | 0 LEGO1/{ => omni/include}/mxdsevent.h | 0 LEGO1/{ => omni/include}/mxdsfile.h | 0 LEGO1/{ => omni/include}/mxdsmediaaction.h | 0 LEGO1/{ => omni/include}/mxdsmultiaction.h | 0 LEGO1/{ => omni/include}/mxdsobject.h | 0 LEGO1/{ => omni/include}/mxdsobjectaction.h | 0 LEGO1/{ => omni/include}/mxdsparallelaction.h | 0 LEGO1/{ => omni/include}/mxdsselectaction.h | 0 LEGO1/{ => omni/include}/mxdsserialaction.h | 0 LEGO1/{ => omni/include}/mxdssound.h | 0 LEGO1/{ => omni/include}/mxdssource.h | 0 LEGO1/{ => omni/include}/mxdsstill.h | 0 .../{ => omni/include}/mxdsstreamingaction.h | 0 LEGO1/{ => omni/include}/mxdssubscriber.h | 0 LEGO1/{ => omni/include}/mxdstypes.h | 0 LEGO1/{ => omni/include}/mxentity.h | 0 LEGO1/{ => omni/include}/mxeventmanager.h | 0 LEGO1/{ => omni/include}/mxeventpresenter.h | 0 LEGO1/{ => omni/include}/mxflcpresenter.h | 0 LEGO1/{ => omni/include}/mxhashtable.h | 0 LEGO1/{ => omni/include}/mxioinfo.h | 0 LEGO1/{ => omni/include}/mxlist.h | 0 .../include}/mxloopingflcpresenter.h | 0 .../include}/mxloopingmidipresenter.h | 0 .../include}/mxloopingsmkpresenter.h | 0 LEGO1/{ => omni/include}/mxmediamanager.h | 0 LEGO1/{ => omni/include}/mxmediapresenter.h | 0 LEGO1/{ => omni/include}/mxmidipresenter.h | 0 LEGO1/{ => omni/include}/mxmusicmanager.h | 0 LEGO1/{ => omni/include}/mxmusicpresenter.h | 0 .../include}/mxnextactiondatastart.h | 0 .../include}/mxnotificationmanager.h | 0 .../{ => omni/include}/mxnotificationparam.h | 0 LEGO1/{ => omni/include}/mxobjectfactory.h | 0 LEGO1/{ => omni/include}/mxomni.h | 0 LEGO1/{ => omni/include}/mxomnicreateflags.h | 0 LEGO1/{ => omni/include}/mxomnicreateparam.h | 0 LEGO1/{ => omni/include}/mxpalette.h | 0 LEGO1/{ => omni/include}/mxparam.h | 0 LEGO1/{ => omni/include}/mxpoint32.h | 0 LEGO1/{ => omni/include}/mxpresenter.h | 0 LEGO1/{ => omni/include}/mxpresenterlist.h | 0 LEGO1/{ => omni/include}/mxqueue.h | 0 .../include}/mxramstreamcontroller.h | 0 .../{ => omni/include}/mxramstreamprovider.h | 0 LEGO1/{ => omni/include}/mxrect32.h | 0 LEGO1/{ => omni/include}/mxrectlist.h | 0 LEGO1/{ => omni/include}/mxregion.h | 0 LEGO1/{ => omni/include}/mxregioncursor.h | 0 LEGO1/{ => omni/include}/mxregionlist.h | 0 LEGO1/{ => omni/include}/mxscheduler.h | 0 LEGO1/{ => omni/include}/mxsemaphore.h | 0 LEGO1/{ => omni/include}/mxsize32.h | 0 LEGO1/{ => omni/include}/mxsmack.h | 0 LEGO1/{ => omni/include}/mxsmkpresenter.h | 0 LEGO1/{ => omni/include}/mxsoundmanager.h | 0 LEGO1/{ => omni/include}/mxsoundpresenter.h | 0 LEGO1/{ => omni/include}/mxstillpresenter.h | 0 LEGO1/{ => omni/include}/mxstreamchunk.h | 0 LEGO1/{ => omni/include}/mxstreamchunklist.h | 0 LEGO1/{ => omni/include}/mxstreamcontroller.h | 0 LEGO1/{ => omni/include}/mxstreamer.h | 0 LEGO1/{ => omni/include}/mxstreamlist.h | 0 LEGO1/{ => omni/include}/mxstreamprovider.h | 0 LEGO1/{ => omni/include}/mxstring.h | 0 LEGO1/{ => omni/include}/mxstringlist.h | 0 LEGO1/{ => omni/include}/mxthread.h | 0 LEGO1/{ => omni/include}/mxticklemanager.h | 0 LEGO1/{ => omni/include}/mxtimer.h | 0 .../{ => omni/include}/mxtransitionmanager.h | 0 .../include}/mxtype17notificationparam.h | 0 .../include}/mxtype18notificationparam.h | 0 .../include}/mxtype19notificationparam.h | 0 LEGO1/{ => omni/include}/mxtypes.h | 0 LEGO1/{ => omni/include}/mxvariable.h | 0 LEGO1/{ => omni/include}/mxvariabletable.h | 0 LEGO1/{ => omni/include}/mxvideomanager.h | 0 LEGO1/{ => omni/include}/mxvideoparam.h | 0 LEGO1/{ => omni/include}/mxvideoparamflags.h | 0 LEGO1/{ => omni/include}/mxvideopresenter.h | 0 LEGO1/{ => omni/include}/mxwavepresenter.h | 0 LEGO1/{ => omni/src/action}/mxdsaction.cpp | 0 LEGO1/{ => omni/src/action}/mxdsanim.cpp | 0 LEGO1/{ => omni/src/action}/mxdsevent.cpp | 0 .../{ => omni/src/action}/mxdsmediaaction.cpp | 0 .../{ => omni/src/action}/mxdsmultiaction.cpp | 0 LEGO1/{ => omni/src/action}/mxdsobject.cpp | 0 .../src/action}/mxdsobjectaction.cpp | 0 .../src/action}/mxdsparallelaction.cpp | 0 .../src/action}/mxdsselectaction.cpp | 0 .../src/action}/mxdsserialaction.cpp | 0 LEGO1/{ => omni/src/action}/mxdssound.cpp | 0 LEGO1/{ => omni/src/action}/mxdsstill.cpp | 0 .../src/action}/mxdsstreamingaction.cpp | 0 LEGO1/{ => omni/src/audio}/mxaudiomanager.cpp | 0 .../{ => omni/src/audio}/mxaudiopresenter.cpp | 0 .../src/audio}/mxbackgroundaudiomanager.cpp | 0 .../src/audio}/mxloopingmidipresenter.cpp | 0 .../{ => omni/src/audio}/mxmidipresenter.cpp | 0 LEGO1/{ => omni/src/audio}/mxmusicmanager.cpp | 0 .../{ => omni/src/audio}/mxmusicpresenter.cpp | 0 LEGO1/{ => omni/src/audio}/mxsoundmanager.cpp | 0 .../{ => omni/src/audio}/mxsoundpresenter.cpp | 0 .../{ => omni/src/audio}/mxwavepresenter.cpp | 0 LEGO1/{ => omni/src/common}/mxatomid.cpp | 0 .../{ => omni/src/common}/mxatomidcounter.cpp | 0 .../src/common}/mxcompositemediapresenter.cpp | 0 .../src/common}/mxcompositepresenter.cpp | 0 LEGO1/{ => omni/src/common}/mxcore.cpp | 0 .../{ => omni/src/common}/mxmediamanager.cpp | 0 .../src/common}/mxmediapresenter.cpp | 0 .../{ => omni/src/common}/mxobjectfactory.cpp | 0 LEGO1/{ => omni/src/common}/mxpresenter.cpp | 0 LEGO1/{ => omni/src/common}/mxstring.cpp | 0 .../{ => omni/src/common}/mxticklemanager.cpp | 0 LEGO1/{ => omni/src/common}/mxtimer.cpp | 0 LEGO1/{ => omni/src/common}/mxvariable.cpp | 0 .../{ => omni/src/common}/mxvariabletable.cpp | 0 .../src/control}/mxcontrolpresenter.cpp | 0 LEGO1/{ => omni/src/entity}/mxentity.cpp | 0 .../{ => omni/src/entity}/mxflcpresenter.cpp | 0 .../src/entity}/mxloopingflcpresenter.cpp | 0 .../src/entity}/mxloopingsmkpresenter.cpp | 0 .../{ => omni/src/entity}/mxsmkpresenter.cpp | 0 .../{ => omni/src/entity}/mxvideomanager.cpp | 0 .../src/entity}/mxvideopresenter.cpp | 0 LEGO1/{ => omni/src/event}/mxeventmanager.cpp | 0 .../{ => omni/src/event}/mxeventpresenter.cpp | 0 .../{dllmain.cpp => omni/src/main/mxmain.cpp} | 0 LEGO1/{ => omni/src/main}/mxomni.cpp | 0 .../{ => omni/src/main}/mxomnicreateflags.cpp | 0 .../{ => omni/src/main}/mxomnicreateparam.cpp | 0 .../src/notify}/mxactionnotificationparam.cpp | 0 .../src/notify}/mxnotificationmanager.cpp | 0 .../src/notify}/mxnotificationparam.cpp | 0 .../src/notify}/mxtype17notificationparam.cpp | 0 .../src/stream}/mxdiskstreamcontroller.cpp | 0 .../src/stream}/mxdiskstreamprovider.cpp | 0 LEGO1/{ => omni/src/stream}/mxdsbuffer.cpp | 0 LEGO1/{ => omni/src/stream}/mxdschunk.cpp | 0 LEGO1/{ => omni/src/stream}/mxdsfile.cpp | 0 LEGO1/{ => omni/src/stream}/mxdssource.cpp | 0 .../{ => omni/src/stream}/mxdssubscriber.cpp | 0 LEGO1/{ => omni/src/stream}/mxioinfo.cpp | 0 .../src/stream}/mxramstreamcontroller.cpp | 0 .../src/stream}/mxramstreamprovider.cpp | 0 LEGO1/{ => omni/src/stream}/mxstreamchunk.cpp | 0 .../src/stream}/mxstreamcontroller.cpp | 0 LEGO1/{ => omni/src/stream}/mxstreamer.cpp | 0 LEGO1/{ => omni/src/stream}/mxstreamlist.cpp | 0 .../src/stream}/mxstreamprovider.cpp | 0 LEGO1/{ => omni/src/system}/mxautolocker.cpp | 0 .../src/system}/mxcriticalsection.cpp | 0 LEGO1/{ => omni/src/system}/mxscheduler.cpp | 0 LEGO1/{ => omni/src/system}/mxsemaphore.cpp | 0 LEGO1/{ => omni/src/system}/mxthread.cpp | 0 LEGO1/{ => omni/src/video}/mxbitmap.cpp | 0 .../{ => omni/src/video}/mxdisplaysurface.cpp | 0 LEGO1/{ => omni/src/video}/mxpalette.cpp | 0 LEGO1/{ => omni/src/video}/mxregion.cpp | 0 LEGO1/{ => omni/src/video}/mxregioncursor.cpp | 0 LEGO1/{ => omni/src/video}/mxsmack.cpp | 0 .../{ => omni/src/video}/mxstillpresenter.cpp | 0 .../src/video}/mxtransitionmanager.cpp | 0 LEGO1/{ => omni/src/video}/mxvideoparam.cpp | 0 .../src/video}/mxvideoparamflags.cpp | 0 LEGO1/racecar.cpp | 15 - LEGO1/racecar.h | 32 -- 432 files changed, 303 insertions(+), 1023 deletions(-) delete mode 100644 LEGO1/buildingentity.cpp delete mode 100644 LEGO1/buildingentity.h delete mode 100644 LEGO1/dunebuggy.cpp delete mode 100644 LEGO1/dunebuggy.h delete mode 100644 LEGO1/helicopter.cpp delete mode 100644 LEGO1/helicopter.h delete mode 100644 LEGO1/helicopterstate.cpp delete mode 100644 LEGO1/helicopterstate.h delete mode 100644 LEGO1/jetski.cpp delete mode 100644 LEGO1/jetski.h rename LEGO1/{ => lego/legoomni/include}/extra.h (100%) rename LEGO1/{ => lego/legoomni/include}/gifmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/lego3dwavepresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoactioncontrolpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoactorpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoanimactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoanimationmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoanimmmpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoanimpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legobackgroundcolor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legobuildingmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocachesound.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocameracontroller.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocarbuild.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocarbuildanimpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocarraceactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocontrolmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoentity.h (99%) rename LEGO1/{ => lego/legoomni/include}/legoentitypresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoeventnotificationparam.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoextraactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoflctexturepresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legofullscreenmovie.h (100%) rename LEGO1/{ => lego/legoomni/include}/legogamestate.h (100%) rename LEGO1/{ => lego/legoomni/include}/legohideanimpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoinputmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legojetski.h (100%) rename LEGO1/{ => lego/legoomni/include}/legojetskiraceactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoloadcachesoundpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legolocomotionanimpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoloopinganimpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legometerpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legomodelpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legonavcontroller.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoobjectfactory.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoomni.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopalettepresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopartpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopathactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopathboundary.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopathcontroller.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopathcontrollerlist.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopathpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legophonemepresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoplantmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legorace.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoraceactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoracecar.h (100%) rename LEGO1/{ => lego/legoomni/include}/legosoundmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legostate.h (100%) rename LEGO1/{ => lego/legoomni/include}/legostream.h (100%) rename LEGO1/{ => lego/legoomni/include}/legotexturepresenter.h (100%) rename LEGO1/{mxunknown100d7c88.h => lego/legoomni/include/legounknown100d7c88.h} (59%) create mode 100644 LEGO1/lego/legoomni/include/legounknown100d9d00.h rename LEGO1/{ => lego/legoomni/include}/legounksavedatawriter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoutil.h (100%) rename LEGO1/{ => lego/legoomni/include}/legovehiclebuildstate.h (100%) rename LEGO1/{ => lego/legoomni/include}/legovideomanager.h (52%) rename LEGO1/{ => lego/legoomni/include}/legoworld.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoworldlist.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoworldpresenter.h (100%) rename LEGO1/{ => lego/legoomni/src/audio}/legocachesound.cpp (100%) rename LEGO1/{ => lego/legoomni/src/audio}/legoloadcachesoundpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/audio}/legosoundmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/gifmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legoactioncontrolpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legobackgroundcolor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legocameracontroller.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legofullscreenmovie.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legogamestate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legonavcontroller.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legoobjectfactory.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legoplantmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legostate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legostream.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legounksavedatawriter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legoutil.cpp (100%) rename LEGO1/{ => lego/legoomni/src/control}/legocontrolmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoactor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoanimactor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoentity.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoentitypresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legojetski.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legopathactor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legorace.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoworld.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoworldpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/input}/legoinputmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/main}/legoomni.cpp (100%) rename LEGO1/{ => lego/legoomni/src/notify}/legoeventnotificationparam.cpp (100%) rename LEGO1/{ => lego/legoomni/src/paths}/legopathcontroller.cpp (100%) rename LEGO1/{ => lego/legoomni/src/paths}/legopathpresenter.cpp (100%) create mode 100644 LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp rename LEGO1/{ => lego/legoomni/src/video}/legoanimationmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legoanimmmpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legoanimpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legocarbuildanimpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legoflctexturepresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legohideanimpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legolocomotionanimpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legometerpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legomodelpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legopalettepresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legopartpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legophonemepresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legotexturepresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legovideomanager.cpp (99%) rename LEGO1/{ => lego/scripts/act1}/act1state.cpp (100%) rename LEGO1/{ => lego/scripts/act1}/act1state.h (100%) rename LEGO1/{ => lego/scripts/act2}/act2brick.cpp (100%) rename LEGO1/{ => lego/scripts/act2}/act2brick.h (100%) rename LEGO1/{ => lego/scripts/act2}/act2policestation.cpp (100%) rename LEGO1/{ => lego/scripts/act2}/act2policestation.h (100%) rename LEGO1/{ => lego/scripts/act2}/legoact2.h (100%) rename LEGO1/{ => lego/scripts/act2}/legoact2state.cpp (100%) rename LEGO1/{ => lego/scripts/act2}/legoact2state.h (100%) rename LEGO1/{ => lego/scripts/act3}/act3.cpp (100%) rename LEGO1/{ => lego/scripts/act3}/act3.h (100%) rename LEGO1/{ => lego/scripts/act3}/act3actor.h (100%) rename LEGO1/{ => lego/scripts/act3}/act3shark.cpp (100%) rename LEGO1/{ => lego/scripts/act3}/act3shark.h (100%) rename LEGO1/{ => lego/scripts/act3}/act3state.cpp (100%) rename LEGO1/{ => lego/scripts/act3}/act3state.h (100%) rename LEGO1/{ => lego/scripts/gasstation}/gasstation.cpp (100%) rename LEGO1/{ => lego/scripts/gasstation}/gasstation.h (100%) rename LEGO1/{ => lego/scripts/gasstation}/gasstationentity.cpp (100%) rename LEGO1/{ => lego/scripts/gasstation}/gasstationentity.h (100%) rename LEGO1/{ => lego/scripts/gasstation}/gasstationstate.cpp (100%) rename LEGO1/{ => lego/scripts/gasstation}/gasstationstate.h (100%) rename LEGO1/{ => lego/scripts/hospital}/ambulance.cpp (100%) rename LEGO1/{ => lego/scripts/hospital}/ambulance.h (100%) rename LEGO1/{ => lego/scripts/hospital}/ambulancemissionstate.cpp (100%) rename LEGO1/{ => lego/scripts/hospital}/ambulancemissionstate.h (100%) rename LEGO1/{ => lego/scripts/hospital}/hospital.cpp (100%) rename LEGO1/{ => lego/scripts/hospital}/hospital.h (100%) rename LEGO1/{ => lego/scripts/hospital}/hospitalentity.cpp (100%) rename LEGO1/{ => lego/scripts/hospital}/hospitalentity.h (100%) rename LEGO1/{ => lego/scripts/hospital}/hospitalstate.cpp (100%) rename LEGO1/{ => lego/scripts/hospital}/hospitalstate.h (100%) rename LEGO1/{ => lego/scripts/infocenter}/elevatorbottom.cpp (100%) rename LEGO1/{ => lego/scripts/infocenter}/elevatorbottom.h (100%) rename LEGO1/{ => lego/scripts/infocenter}/infocenter.cpp (100%) rename LEGO1/{ => lego/scripts/infocenter}/infocenter.h (100%) rename LEGO1/{ => lego/scripts/infocenter}/infocenterdoor.cpp (100%) rename LEGO1/{ => lego/scripts/infocenter}/infocenterdoor.h (100%) rename LEGO1/{ => lego/scripts/infocenter}/infocenterentity.cpp (100%) rename LEGO1/{ => lego/scripts/infocenter}/infocenterentity.h (100%) rename LEGO1/{ => lego/scripts/infocenter}/infocenterstate.cpp (100%) rename LEGO1/{ => lego/scripts/infocenter}/infocenterstate.h (100%) rename LEGO1/{ => lego/scripts/infocenter}/registrationbook.cpp (100%) rename LEGO1/{ => lego/scripts/infocenter}/registrationbook.h (100%) rename LEGO1/{ => lego/scripts/infocenter}/score.cpp (100%) rename LEGO1/{ => lego/scripts/infocenter}/score.h (100%) rename LEGO1/{ => lego/scripts/infocenter}/scorestate.cpp (100%) rename LEGO1/{ => lego/scripts/infocenter}/scorestate.h (100%) rename LEGO1/{ => lego/scripts/isle}/animstate.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/animstate.h (100%) rename LEGO1/{ => lego/scripts/isle}/beachhouseentity.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/beachhouseentity.h (100%) rename LEGO1/{ => lego/scripts/isle}/bike.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/bike.h (100%) rename LEGO1/{ => lego/scripts/isle}/bumpbouy.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/bumpbouy.h (100%) rename LEGO1/{ => lego/scripts/isle}/doors.h (100%) rename LEGO1/{ => lego/scripts/isle}/historybook.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/historybook.h (100%) rename LEGO1/{ => lego/scripts/isle}/isle.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/isle.h (100%) rename LEGO1/{ => lego/scripts/isle}/isleactor.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/isleactor.h (100%) rename LEGO1/{ => lego/scripts/isle}/islepathactor.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/islepathactor.h (100%) rename LEGO1/{ => lego/scripts/isle}/jukebox.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/jukebox.h (100%) rename LEGO1/{ => lego/scripts/isle}/jukeboxentity.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/jukeboxentity.h (100%) rename LEGO1/{ => lego/scripts/isle}/jukeboxstate.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/jukeboxstate.h (100%) rename LEGO1/{ => lego/scripts/isle}/motorcycle.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/motorcycle.h (100%) rename LEGO1/{ => lego/scripts/isle}/radio.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/radio.h (100%) rename LEGO1/{ => lego/scripts/isle}/radiostate.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/radiostate.h (100%) rename LEGO1/{ => lego/scripts/isle}/skateboard.cpp (100%) rename LEGO1/{ => lego/scripts/isle}/skateboard.h (100%) rename LEGO1/{ => lego/scripts/pizzeria}/pizza.cpp (100%) rename LEGO1/{ => lego/scripts/pizzeria}/pizza.h (100%) rename LEGO1/{ => lego/scripts/pizzeria}/pizzamissionstate.cpp (100%) rename LEGO1/{ => lego/scripts/pizzeria}/pizzamissionstate.h (100%) rename LEGO1/{ => lego/scripts/pizzeria}/pizzeria.cpp (100%) rename LEGO1/{ => lego/scripts/pizzeria}/pizzeria.h (100%) rename LEGO1/{ => lego/scripts/pizzeria}/pizzeriastate.cpp (100%) rename LEGO1/{ => lego/scripts/pizzeria}/pizzeriastate.h (100%) rename LEGO1/{ => lego/scripts/police}/police.cpp (100%) rename LEGO1/{ => lego/scripts/police}/police.h (100%) rename LEGO1/{ => lego/scripts/police}/policeentity.cpp (100%) rename LEGO1/{ => lego/scripts/police}/policeentity.h (100%) rename LEGO1/{ => lego/scripts/police}/policestate.cpp (100%) rename LEGO1/{ => lego/scripts/police}/policestate.h (100%) rename LEGO1/{ => lego/scripts/race}/carrace.cpp (100%) rename LEGO1/{ => lego/scripts/race}/carrace.h (100%) rename LEGO1/{ => lego/scripts/race}/carracestate.h (100%) rename LEGO1/{ => lego/scripts/race}/jetskirace.cpp (100%) rename LEGO1/{ => lego/scripts/race}/jetskirace.h (100%) rename LEGO1/{ => lego/scripts/race}/jetskiracestate.h (100%) rename LEGO1/{ => lego/scripts/race}/racestandsentity.cpp (100%) rename LEGO1/{ => lego/scripts/race}/racestandsentity.h (100%) rename LEGO1/{ => lego/scripts/race}/racestate.cpp (100%) rename LEGO1/{ => lego/scripts/race}/racestate.h (100%) rename LEGO1/{ => lego/scripts/towtrack}/towtrack.cpp (100%) rename LEGO1/{ => lego/scripts/towtrack}/towtrack.h (100%) rename LEGO1/{ => lego/scripts/towtrack}/towtrackmissionstate.cpp (100%) rename LEGO1/{ => lego/scripts/towtrack}/towtrackmissionstate.h (100%) rename LEGO1/{ => lego/sources}/3dmanager/lego3dmanager.cpp (100%) rename LEGO1/{ => lego/sources}/3dmanager/lego3dmanager.h (100%) rename LEGO1/{ => lego/sources}/3dmanager/lego3dview.cpp (100%) rename LEGO1/{ => lego/sources}/3dmanager/lego3dview.h (100%) rename LEGO1/{ => lego/sources}/3dmanager/legoview1.cpp (100%) rename LEGO1/{ => lego/sources}/3dmanager/legoview1.h (100%) rename LEGO1/{ => lego/sources}/3dmanager/tglsurface.cpp (100%) rename LEGO1/{ => lego/sources}/3dmanager/tglsurface.h (97%) rename LEGO1/{ => lego/sources/roi}/legoroi.cpp (100%) rename LEGO1/{ => lego/sources/roi}/legoroi.h (100%) delete mode 100644 LEGO1/legobuildingmanager.cpp delete mode 100644 LEGO1/legocarbuild.cpp delete mode 100644 LEGO1/legovehiclebuildstate.cpp delete mode 100644 LEGO1/mxparam.cpp delete mode 100644 LEGO1/mxunknown100d7c88.cpp delete mode 100644 LEGO1/mxunknown100d9d00.h rename LEGO1/{ => omni/include}/mxactionnotificationparam.h (100%) rename LEGO1/{ => omni/include}/mxatomid.h (100%) rename LEGO1/{ => omni/include}/mxatomidcounter.h (100%) rename LEGO1/{ => omni/include}/mxaudiomanager.h (100%) rename LEGO1/{ => omni/include}/mxaudiopresenter.h (100%) rename LEGO1/{ => omni/include}/mxautolocker.h (100%) rename LEGO1/{ => omni/include}/mxbackgroundaudiomanager.h (100%) rename LEGO1/{ => omni/include}/mxbitmap.h (100%) rename LEGO1/{ => omni/include}/mxcollection.h (100%) rename LEGO1/{ => omni/include}/mxcompositemediapresenter.h (100%) rename LEGO1/{ => omni/include}/mxcompositepresenter.h (100%) rename LEGO1/{ => omni/include}/mxcontrolpresenter.h (100%) rename LEGO1/{ => omni/include}/mxcore.h (100%) rename LEGO1/{ => omni/include}/mxcriticalsection.h (100%) rename LEGO1/{ => omni/include}/mxdiskstreamcontroller.h (100%) rename LEGO1/{ => omni/include}/mxdiskstreamprovider.h (100%) rename LEGO1/{ => omni/include}/mxdisplaysurface.h (100%) rename LEGO1/{ => omni/include}/mxdsaction.h (100%) rename LEGO1/{ => omni/include}/mxdsactionlist.h (100%) rename LEGO1/{ => omni/include}/mxdsanim.h (100%) rename LEGO1/{ => omni/include}/mxdsbuffer.h (100%) rename LEGO1/{ => omni/include}/mxdschunk.h (100%) rename LEGO1/{ => omni/include}/mxdsevent.h (100%) rename LEGO1/{ => omni/include}/mxdsfile.h (100%) rename LEGO1/{ => omni/include}/mxdsmediaaction.h (100%) rename LEGO1/{ => omni/include}/mxdsmultiaction.h (100%) rename LEGO1/{ => omni/include}/mxdsobject.h (100%) rename LEGO1/{ => omni/include}/mxdsobjectaction.h (100%) rename LEGO1/{ => omni/include}/mxdsparallelaction.h (100%) rename LEGO1/{ => omni/include}/mxdsselectaction.h (100%) rename LEGO1/{ => omni/include}/mxdsserialaction.h (100%) rename LEGO1/{ => omni/include}/mxdssound.h (100%) rename LEGO1/{ => omni/include}/mxdssource.h (100%) rename LEGO1/{ => omni/include}/mxdsstill.h (100%) rename LEGO1/{ => omni/include}/mxdsstreamingaction.h (100%) rename LEGO1/{ => omni/include}/mxdssubscriber.h (100%) rename LEGO1/{ => omni/include}/mxdstypes.h (100%) mode change 100755 => 100644 rename LEGO1/{ => omni/include}/mxentity.h (100%) rename LEGO1/{ => omni/include}/mxeventmanager.h (100%) rename LEGO1/{ => omni/include}/mxeventpresenter.h (100%) rename LEGO1/{ => omni/include}/mxflcpresenter.h (100%) rename LEGO1/{ => omni/include}/mxhashtable.h (100%) rename LEGO1/{ => omni/include}/mxioinfo.h (100%) rename LEGO1/{ => omni/include}/mxlist.h (100%) rename LEGO1/{ => omni/include}/mxloopingflcpresenter.h (100%) rename LEGO1/{ => omni/include}/mxloopingmidipresenter.h (100%) rename LEGO1/{ => omni/include}/mxloopingsmkpresenter.h (100%) rename LEGO1/{ => omni/include}/mxmediamanager.h (100%) rename LEGO1/{ => omni/include}/mxmediapresenter.h (100%) rename LEGO1/{ => omni/include}/mxmidipresenter.h (100%) rename LEGO1/{ => omni/include}/mxmusicmanager.h (100%) rename LEGO1/{ => omni/include}/mxmusicpresenter.h (100%) rename LEGO1/{ => omni/include}/mxnextactiondatastart.h (100%) rename LEGO1/{ => omni/include}/mxnotificationmanager.h (100%) rename LEGO1/{ => omni/include}/mxnotificationparam.h (100%) rename LEGO1/{ => omni/include}/mxobjectfactory.h (100%) rename LEGO1/{ => omni/include}/mxomni.h (100%) rename LEGO1/{ => omni/include}/mxomnicreateflags.h (100%) rename LEGO1/{ => omni/include}/mxomnicreateparam.h (100%) rename LEGO1/{ => omni/include}/mxpalette.h (100%) rename LEGO1/{ => omni/include}/mxparam.h (100%) rename LEGO1/{ => omni/include}/mxpoint32.h (100%) mode change 100755 => 100644 rename LEGO1/{ => omni/include}/mxpresenter.h (100%) rename LEGO1/{ => omni/include}/mxpresenterlist.h (100%) rename LEGO1/{ => omni/include}/mxqueue.h (100%) rename LEGO1/{ => omni/include}/mxramstreamcontroller.h (100%) rename LEGO1/{ => omni/include}/mxramstreamprovider.h (100%) rename LEGO1/{ => omni/include}/mxrect32.h (100%) rename LEGO1/{ => omni/include}/mxrectlist.h (100%) rename LEGO1/{ => omni/include}/mxregion.h (100%) rename LEGO1/{ => omni/include}/mxregioncursor.h (100%) rename LEGO1/{ => omni/include}/mxregionlist.h (100%) rename LEGO1/{ => omni/include}/mxscheduler.h (100%) rename LEGO1/{ => omni/include}/mxsemaphore.h (100%) rename LEGO1/{ => omni/include}/mxsize32.h (100%) rename LEGO1/{ => omni/include}/mxsmack.h (100%) rename LEGO1/{ => omni/include}/mxsmkpresenter.h (100%) rename LEGO1/{ => omni/include}/mxsoundmanager.h (100%) rename LEGO1/{ => omni/include}/mxsoundpresenter.h (100%) rename LEGO1/{ => omni/include}/mxstillpresenter.h (100%) rename LEGO1/{ => omni/include}/mxstreamchunk.h (100%) rename LEGO1/{ => omni/include}/mxstreamchunklist.h (100%) rename LEGO1/{ => omni/include}/mxstreamcontroller.h (100%) rename LEGO1/{ => omni/include}/mxstreamer.h (100%) rename LEGO1/{ => omni/include}/mxstreamlist.h (100%) rename LEGO1/{ => omni/include}/mxstreamprovider.h (100%) rename LEGO1/{ => omni/include}/mxstring.h (100%) rename LEGO1/{ => omni/include}/mxstringlist.h (100%) rename LEGO1/{ => omni/include}/mxthread.h (100%) rename LEGO1/{ => omni/include}/mxticklemanager.h (100%) rename LEGO1/{ => omni/include}/mxtimer.h (100%) rename LEGO1/{ => omni/include}/mxtransitionmanager.h (100%) rename LEGO1/{ => omni/include}/mxtype17notificationparam.h (100%) rename LEGO1/{ => omni/include}/mxtype18notificationparam.h (100%) rename LEGO1/{ => omni/include}/mxtype19notificationparam.h (100%) rename LEGO1/{ => omni/include}/mxtypes.h (100%) rename LEGO1/{ => omni/include}/mxvariable.h (100%) rename LEGO1/{ => omni/include}/mxvariabletable.h (100%) rename LEGO1/{ => omni/include}/mxvideomanager.h (100%) rename LEGO1/{ => omni/include}/mxvideoparam.h (100%) rename LEGO1/{ => omni/include}/mxvideoparamflags.h (100%) rename LEGO1/{ => omni/include}/mxvideopresenter.h (100%) rename LEGO1/{ => omni/include}/mxwavepresenter.h (100%) rename LEGO1/{ => omni/src/action}/mxdsaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsanim.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsevent.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsmediaaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsmultiaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsobject.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsobjectaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsparallelaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsselectaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsserialaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdssound.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsstill.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsstreamingaction.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxaudiomanager.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxaudiopresenter.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxbackgroundaudiomanager.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxloopingmidipresenter.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxmidipresenter.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxmusicmanager.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxmusicpresenter.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxsoundmanager.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxsoundpresenter.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxwavepresenter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxatomid.cpp (100%) rename LEGO1/{ => omni/src/common}/mxatomidcounter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxcompositemediapresenter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxcompositepresenter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxcore.cpp (100%) rename LEGO1/{ => omni/src/common}/mxmediamanager.cpp (100%) rename LEGO1/{ => omni/src/common}/mxmediapresenter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxobjectfactory.cpp (100%) rename LEGO1/{ => omni/src/common}/mxpresenter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxstring.cpp (100%) rename LEGO1/{ => omni/src/common}/mxticklemanager.cpp (100%) rename LEGO1/{ => omni/src/common}/mxtimer.cpp (100%) rename LEGO1/{ => omni/src/common}/mxvariable.cpp (100%) rename LEGO1/{ => omni/src/common}/mxvariabletable.cpp (100%) rename LEGO1/{ => omni/src/control}/mxcontrolpresenter.cpp (100%) rename LEGO1/{ => omni/src/entity}/mxentity.cpp (100%) rename LEGO1/{ => omni/src/entity}/mxflcpresenter.cpp (100%) rename LEGO1/{ => omni/src/entity}/mxloopingflcpresenter.cpp (100%) rename LEGO1/{ => omni/src/entity}/mxloopingsmkpresenter.cpp (100%) rename LEGO1/{ => omni/src/entity}/mxsmkpresenter.cpp (100%) rename LEGO1/{ => omni/src/entity}/mxvideomanager.cpp (100%) rename LEGO1/{ => omni/src/entity}/mxvideopresenter.cpp (100%) rename LEGO1/{ => omni/src/event}/mxeventmanager.cpp (100%) rename LEGO1/{ => omni/src/event}/mxeventpresenter.cpp (100%) rename LEGO1/{dllmain.cpp => omni/src/main/mxmain.cpp} (100%) rename LEGO1/{ => omni/src/main}/mxomni.cpp (100%) rename LEGO1/{ => omni/src/main}/mxomnicreateflags.cpp (100%) rename LEGO1/{ => omni/src/main}/mxomnicreateparam.cpp (100%) rename LEGO1/{ => omni/src/notify}/mxactionnotificationparam.cpp (100%) rename LEGO1/{ => omni/src/notify}/mxnotificationmanager.cpp (100%) rename LEGO1/{ => omni/src/notify}/mxnotificationparam.cpp (100%) rename LEGO1/{ => omni/src/notify}/mxtype17notificationparam.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdiskstreamcontroller.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdiskstreamprovider.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdsbuffer.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdschunk.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdsfile.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdssource.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdssubscriber.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxioinfo.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxramstreamcontroller.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxramstreamprovider.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxstreamchunk.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxstreamcontroller.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxstreamer.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxstreamlist.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxstreamprovider.cpp (100%) rename LEGO1/{ => omni/src/system}/mxautolocker.cpp (100%) rename LEGO1/{ => omni/src/system}/mxcriticalsection.cpp (100%) rename LEGO1/{ => omni/src/system}/mxscheduler.cpp (100%) rename LEGO1/{ => omni/src/system}/mxsemaphore.cpp (100%) rename LEGO1/{ => omni/src/system}/mxthread.cpp (100%) rename LEGO1/{ => omni/src/video}/mxbitmap.cpp (100%) rename LEGO1/{ => omni/src/video}/mxdisplaysurface.cpp (100%) rename LEGO1/{ => omni/src/video}/mxpalette.cpp (100%) rename LEGO1/{ => omni/src/video}/mxregion.cpp (100%) rename LEGO1/{ => omni/src/video}/mxregioncursor.cpp (100%) rename LEGO1/{ => omni/src/video}/mxsmack.cpp (100%) rename LEGO1/{ => omni/src/video}/mxstillpresenter.cpp (100%) rename LEGO1/{ => omni/src/video}/mxtransitionmanager.cpp (100%) rename LEGO1/{ => omni/src/video}/mxvideoparam.cpp (100%) rename LEGO1/{ => omni/src/video}/mxvideoparamflags.cpp (100%) delete mode 100644 LEGO1/racecar.cpp delete mode 100644 LEGO1/racecar.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 536c96c6..a0c20b83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,212 +7,210 @@ option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC}) option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON) add_library(lego1 SHARED - LEGO1/3dmanager/lego3dmanager.cpp - LEGO1/3dmanager/lego3dview.cpp - LEGO1/3dmanager/legoview1.cpp - LEGO1/3dmanager/tglsurface.cpp - LEGO1/act1state.cpp - LEGO1/act2brick.cpp - LEGO1/act2policestation.cpp - LEGO1/act3.cpp - LEGO1/act3shark.cpp - LEGO1/act3state.cpp - LEGO1/ambulance.cpp - LEGO1/ambulancemissionstate.cpp - LEGO1/animstate.cpp - LEGO1/beachhouseentity.cpp - LEGO1/bike.cpp - LEGO1/buildingentity.cpp - LEGO1/bumpbouy.cpp - LEGO1/carrace.cpp LEGO1/define.cpp - LEGO1/dllmain.cpp - LEGO1/dunebuggy.cpp - LEGO1/elevatorbottom.cpp - LEGO1/gasstation.cpp - LEGO1/gasstationentity.cpp - LEGO1/gasstationstate.cpp - LEGO1/gifmanager.cpp - LEGO1/helicopter.cpp - LEGO1/helicopterstate.cpp - LEGO1/historybook.cpp - LEGO1/hospital.cpp - LEGO1/hospitalentity.cpp - LEGO1/hospitalstate.cpp - LEGO1/infocenter.cpp - LEGO1/infocenterdoor.cpp - LEGO1/infocenterentity.cpp - LEGO1/infocenterstate.cpp - LEGO1/isle.cpp - LEGO1/isleactor.cpp - LEGO1/islepathactor.cpp - LEGO1/jetski.cpp - LEGO1/jetskirace.cpp - LEGO1/jukebox.cpp - LEGO1/jukeboxentity.cpp - LEGO1/jukeboxstate.cpp - LEGO1/legoact2state.cpp - LEGO1/legoactioncontrolpresenter.cpp - LEGO1/legoactor.cpp - LEGO1/legoactor.cpp - LEGO1/legoanimactor.cpp - LEGO1/legoanimationmanager.cpp - LEGO1/legoanimmmpresenter.cpp - LEGO1/legoanimpresenter.cpp - LEGO1/legobackgroundcolor.cpp - LEGO1/legobackgroundcolor.cpp - LEGO1/legobuildingmanager.cpp - LEGO1/legocachesound.cpp - LEGO1/legocameracontroller.cpp - LEGO1/legocarbuild.cpp - LEGO1/legocarbuildanimpresenter.cpp - LEGO1/legocontrolmanager.cpp - LEGO1/legoentity.cpp - LEGO1/legoentitypresenter.cpp - LEGO1/legoeventnotificationparam.cpp - LEGO1/legoflctexturepresenter.cpp - LEGO1/legofullscreenmovie.cpp - LEGO1/legogamestate.cpp - LEGO1/legohideanimpresenter.cpp - LEGO1/legoinputmanager.cpp - LEGO1/legojetski.cpp - LEGO1/legoloadcachesoundpresenter.cpp - LEGO1/legolocomotionanimpresenter.cpp - LEGO1/legometerpresenter.cpp - LEGO1/legomodelpresenter.cpp - LEGO1/legonavcontroller.cpp - LEGO1/legoobjectfactory.cpp - LEGO1/legoomni.cpp - LEGO1/legopalettepresenter.cpp - LEGO1/legopartpresenter.cpp - LEGO1/legopathactor.cpp - LEGO1/legopathcontroller.cpp - LEGO1/legopathpresenter.cpp - LEGO1/legophonemepresenter.cpp - LEGO1/legoplantmanager.cpp - LEGO1/legorace.cpp - LEGO1/legoroi.cpp - LEGO1/legosoundmanager.cpp - LEGO1/legostate.cpp - LEGO1/legostream.cpp - LEGO1/legotexturepresenter.cpp - LEGO1/legoutil.cpp - LEGO1/legounksavedatawriter.cpp - LEGO1/legovehiclebuildstate.cpp - LEGO1/legovideomanager.cpp - LEGO1/legoworld.cpp - LEGO1/legoworldpresenter.cpp - LEGO1/motorcycle.cpp - LEGO1/mxactionnotificationparam.cpp - LEGO1/mxatomid.cpp - LEGO1/mxatomidcounter.cpp - LEGO1/mxaudiomanager.cpp - LEGO1/mxaudiopresenter.cpp - LEGO1/mxautolocker.cpp - LEGO1/mxbackgroundaudiomanager.cpp - LEGO1/mxbitmap.cpp - LEGO1/mxcompositemediapresenter.cpp - LEGO1/mxcompositepresenter.cpp - LEGO1/mxcontrolpresenter.cpp - LEGO1/mxcore.cpp - LEGO1/mxcriticalsection.cpp + LEGO1/lego/legoomni/src/audio/legocachesound.cpp + LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp + LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp + LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp + LEGO1/lego/legoomni/src/build/legocarbuild.cpp + LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp + LEGO1/lego/legoomni/src/common/gifmanager.cpp + LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp + LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp + LEGO1/lego/legoomni/src/common/legocameracontroller.cpp + LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp + LEGO1/lego/legoomni/src/common/legogamestate.cpp + LEGO1/lego/legoomni/src/common/legonavcontroller.cpp + LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp + LEGO1/lego/legoomni/src/common/legoplantmanager.cpp + LEGO1/lego/legoomni/src/common/legostate.cpp + LEGO1/lego/legoomni/src/common/legostream.cpp + LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp + LEGO1/lego/legoomni/src/common/legoutil.cpp + LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp + LEGO1/lego/legoomni/src/entity/legoactor.cpp + LEGO1/lego/legoomni/src/entity/legoanimactor.cpp + LEGO1/lego/legoomni/src/entity/legoentity.cpp + LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp + LEGO1/lego/legoomni/src/entity/legojetski.cpp + LEGO1/lego/legoomni/src/entity/legopathactor.cpp + LEGO1/lego/legoomni/src/entity/legorace.cpp + LEGO1/lego/legoomni/src/entity/legoworld.cpp + LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp + LEGO1/lego/legoomni/src/input/legoinputmanager.cpp + LEGO1/lego/legoomni/src/main/legoomni.cpp + LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp + LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp + LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp + LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp + LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp + LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp + LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp + LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp + LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp + LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp + LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp + LEGO1/lego/legoomni/src/video/legometerpresenter.cpp + LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp + LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp + LEGO1/lego/legoomni/src/video/legopartpresenter.cpp + LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp + LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp + LEGO1/lego/legoomni/src/video/legovideomanager.cpp + LEGO1/lego/scripts/act1/act1state.cpp + LEGO1/lego/scripts/act2/act2brick.cpp + LEGO1/lego/scripts/act2/act2policestation.cpp + LEGO1/lego/scripts/act2/legoact2state.cpp + LEGO1/lego/scripts/act3/act3.cpp + LEGO1/lego/scripts/act3/act3shark.cpp + LEGO1/lego/scripts/act3/act3state.cpp + LEGO1/lego/scripts/build/buildingentity.cpp + LEGO1/lego/scripts/build/dunebuggy.cpp + LEGO1/lego/scripts/build/helicopter.cpp + LEGO1/lego/scripts/build/helicopterstate.cpp + LEGO1/lego/scripts/build/jetski.cpp + LEGO1/lego/scripts/build/racecar.cpp + LEGO1/lego/scripts/gasstation/gasstation.cpp + LEGO1/lego/scripts/gasstation/gasstationentity.cpp + LEGO1/lego/scripts/gasstation/gasstationstate.cpp + LEGO1/lego/scripts/hospital/ambulance.cpp + LEGO1/lego/scripts/hospital/ambulancemissionstate.cpp + LEGO1/lego/scripts/hospital/hospital.cpp + LEGO1/lego/scripts/hospital/hospitalentity.cpp + LEGO1/lego/scripts/hospital/hospitalstate.cpp + LEGO1/lego/scripts/infocenter/elevatorbottom.cpp + LEGO1/lego/scripts/infocenter/infocenter.cpp + LEGO1/lego/scripts/infocenter/infocenterdoor.cpp + LEGO1/lego/scripts/infocenter/infocenterentity.cpp + LEGO1/lego/scripts/infocenter/infocenterstate.cpp + LEGO1/lego/scripts/infocenter/registrationbook.cpp + LEGO1/lego/scripts/infocenter/score.cpp + LEGO1/lego/scripts/infocenter/scorestate.cpp + LEGO1/lego/scripts/isle/animstate.cpp + LEGO1/lego/scripts/isle/beachhouseentity.cpp + LEGO1/lego/scripts/isle/bike.cpp + LEGO1/lego/scripts/isle/bumpbouy.cpp + LEGO1/lego/scripts/isle/historybook.cpp + LEGO1/lego/scripts/isle/isleactor.cpp + LEGO1/lego/scripts/isle/isle.cpp + LEGO1/lego/scripts/isle/islepathactor.cpp + LEGO1/lego/scripts/isle/jukebox.cpp + LEGO1/lego/scripts/isle/jukeboxentity.cpp + LEGO1/lego/scripts/isle/jukeboxstate.cpp + LEGO1/lego/scripts/isle/motorcycle.cpp + LEGO1/lego/scripts/isle/radio.cpp + LEGO1/lego/scripts/isle/radiostate.cpp + LEGO1/lego/scripts/isle/skateboard.cpp + LEGO1/lego/scripts/pizzeria/pizza.cpp + LEGO1/lego/scripts/pizzeria/pizzamissionstate.cpp + LEGO1/lego/scripts/pizzeria/pizzeria.cpp + LEGO1/lego/scripts/pizzeria/pizzeriastate.cpp + LEGO1/lego/scripts/police/police.cpp + LEGO1/lego/scripts/police/policeentity.cpp + LEGO1/lego/scripts/police/policestate.cpp + LEGO1/lego/scripts/race/carrace.cpp + LEGO1/lego/scripts/race/jetskirace.cpp + LEGO1/lego/scripts/race/racestandsentity.cpp + LEGO1/lego/scripts/race/racestate.cpp + LEGO1/lego/scripts/towtrack/towtrack.cpp + LEGO1/lego/scripts/towtrack/towtrackmissionstate.cpp + LEGO1/lego/sources/3dmanager/lego3dmanager.cpp + LEGO1/lego/sources/3dmanager/lego3dview.cpp + LEGO1/lego/sources/3dmanager/legoview1.cpp + LEGO1/lego/sources/3dmanager/tglsurface.cpp + LEGO1/lego/sources/roi/legoroi.cpp LEGO1/mxdirectx/mxdirect3d.cpp LEGO1/mxdirectx/mxdirectdraw.cpp - LEGO1/mxdiskstreamcontroller.cpp - LEGO1/mxdiskstreamprovider.cpp - LEGO1/mxdisplaysurface.cpp - LEGO1/mxdsaction.cpp - LEGO1/mxdsanim.cpp - LEGO1/mxdsbuffer.cpp - LEGO1/mxdschunk.cpp - LEGO1/mxdsevent.cpp - LEGO1/mxdsfile.cpp - LEGO1/mxdsmediaaction.cpp - LEGO1/mxdsmultiaction.cpp - LEGO1/mxdsobject.cpp - LEGO1/mxdsobjectaction.cpp - LEGO1/mxdsparallelaction.cpp - LEGO1/mxdsselectaction.cpp - LEGO1/mxdsserialaction.cpp - LEGO1/mxdssound.cpp - LEGO1/mxdssource.cpp - LEGO1/mxdsstill.cpp - LEGO1/mxdsstreamingaction.cpp - LEGO1/mxdssubscriber.cpp - LEGO1/mxentity.cpp - LEGO1/mxeventmanager.cpp - LEGO1/mxeventpresenter.cpp - LEGO1/mxflcpresenter.cpp - LEGO1/mxioinfo.cpp - LEGO1/mxloopingflcpresenter.cpp - LEGO1/mxloopingmidipresenter.cpp - LEGO1/mxloopingsmkpresenter.cpp - LEGO1/mxmediamanager.cpp - LEGO1/mxmediapresenter.cpp - LEGO1/mxmidipresenter.cpp - LEGO1/mxmusicmanager.cpp - LEGO1/mxmusicpresenter.cpp - LEGO1/mxnotificationmanager.cpp - LEGO1/mxnotificationparam.cpp - LEGO1/mxobjectfactory.cpp - LEGO1/mxomni.cpp - LEGO1/mxomnicreateflags.cpp - LEGO1/mxomnicreateparam.cpp - LEGO1/mxpalette.cpp - LEGO1/mxparam.cpp - LEGO1/mxpresenter.cpp - LEGO1/mxramstreamcontroller.cpp - LEGO1/mxramstreamprovider.cpp - LEGO1/mxregion.cpp - LEGO1/mxregioncursor.cpp - LEGO1/mxscheduler.cpp - LEGO1/mxsemaphore.cpp - LEGO1/mxsmack.cpp - LEGO1/mxsmkpresenter.cpp - LEGO1/mxsoundmanager.cpp - LEGO1/mxsoundpresenter.cpp - LEGO1/mxstillpresenter.cpp - LEGO1/mxstreamchunk.cpp - LEGO1/mxstreamcontroller.cpp - LEGO1/mxstreamer.cpp - LEGO1/mxstreamlist.cpp - LEGO1/mxstreamprovider.cpp - LEGO1/mxstring.cpp - LEGO1/mxthread.cpp - LEGO1/mxticklemanager.cpp - LEGO1/mxtimer.cpp - LEGO1/mxtransitionmanager.cpp - LEGO1/mxtype17notificationparam.cpp - LEGO1/mxunknown100d7c88.cpp - LEGO1/mxvariable.cpp - LEGO1/mxvariabletable.cpp - LEGO1/mxvideomanager.cpp - LEGO1/mxvideoparam.cpp - LEGO1/mxvideoparamflags.cpp - LEGO1/mxvideopresenter.cpp - LEGO1/mxwavepresenter.cpp - LEGO1/pizza.cpp - LEGO1/pizzamissionstate.cpp - LEGO1/pizzeria.cpp - LEGO1/pizzeriastate.cpp - LEGO1/police.cpp - LEGO1/policeentity.cpp - LEGO1/policestate.cpp - LEGO1/racecar.cpp - LEGO1/racestandsentity.cpp - LEGO1/racestate.cpp - LEGO1/radio.cpp - LEGO1/radiostate.cpp + LEGO1/omni/src/action/mxdsaction.cpp + LEGO1/omni/src/action/mxdsanim.cpp + LEGO1/omni/src/action/mxdsevent.cpp + LEGO1/omni/src/action/mxdsmediaaction.cpp + LEGO1/omni/src/action/mxdsmultiaction.cpp + LEGO1/omni/src/action/mxdsobjectaction.cpp + LEGO1/omni/src/action/mxdsobject.cpp + LEGO1/omni/src/action/mxdsparallelaction.cpp + LEGO1/omni/src/action/mxdsselectaction.cpp + LEGO1/omni/src/action/mxdsserialaction.cpp + LEGO1/omni/src/action/mxdssound.cpp + LEGO1/omni/src/action/mxdsstill.cpp + LEGO1/omni/src/action/mxdsstreamingaction.cpp + LEGO1/omni/src/audio/mxaudiomanager.cpp + LEGO1/omni/src/audio/mxaudiopresenter.cpp + LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp + LEGO1/omni/src/audio/mxloopingmidipresenter.cpp + LEGO1/omni/src/audio/mxmidipresenter.cpp + LEGO1/omni/src/audio/mxmusicmanager.cpp + LEGO1/omni/src/audio/mxmusicpresenter.cpp + LEGO1/omni/src/audio/mxsoundmanager.cpp + LEGO1/omni/src/audio/mxsoundpresenter.cpp + LEGO1/omni/src/audio/mxwavepresenter.cpp + LEGO1/omni/src/common/mxatomidcounter.cpp + LEGO1/omni/src/common/mxatomid.cpp + LEGO1/omni/src/common/mxcompositemediapresenter.cpp + LEGO1/omni/src/common/mxcompositepresenter.cpp + LEGO1/omni/src/common/mxcore.cpp + LEGO1/omni/src/common/mxmediamanager.cpp + LEGO1/omni/src/common/mxmediapresenter.cpp + LEGO1/omni/src/common/mxobjectfactory.cpp + LEGO1/omni/src/common/mxpresenter.cpp + LEGO1/omni/src/common/mxstring.cpp + LEGO1/omni/src/common/mxticklemanager.cpp + LEGO1/omni/src/common/mxtimer.cpp + LEGO1/omni/src/common/mxvariable.cpp + LEGO1/omni/src/common/mxvariabletable.cpp + LEGO1/omni/src/control/mxcontrolpresenter.cpp + LEGO1/omni/src/entity/mxentity.cpp + LEGO1/omni/src/entity/mxflcpresenter.cpp + LEGO1/omni/src/entity/mxloopingflcpresenter.cpp + LEGO1/omni/src/entity/mxloopingsmkpresenter.cpp + LEGO1/omni/src/entity/mxsmkpresenter.cpp + LEGO1/omni/src/entity/mxvideomanager.cpp + LEGO1/omni/src/entity/mxvideopresenter.cpp + LEGO1/omni/src/event/mxeventmanager.cpp + LEGO1/omni/src/event/mxeventpresenter.cpp + LEGO1/omni/src/main/mxmain.cpp + LEGO1/omni/src/main/mxomni.cpp + LEGO1/omni/src/main/mxomnicreateflags.cpp + LEGO1/omni/src/main/mxomnicreateparam.cpp + LEGO1/omni/src/notify/mxactionnotificationparam.cpp + LEGO1/omni/src/notify/mxnotificationmanager.cpp + LEGO1/omni/src/notify/mxnotificationparam.cpp + LEGO1/omni/src/notify/mxtype17notificationparam.cpp + LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp + LEGO1/omni/src/stream/mxdiskstreamprovider.cpp + LEGO1/omni/src/stream/mxdsbuffer.cpp + LEGO1/omni/src/stream/mxdschunk.cpp + LEGO1/omni/src/stream/mxdsfile.cpp + LEGO1/omni/src/stream/mxdssource.cpp + LEGO1/omni/src/stream/mxdssubscriber.cpp + LEGO1/omni/src/stream/mxioinfo.cpp + LEGO1/omni/src/stream/mxramstreamcontroller.cpp + LEGO1/omni/src/stream/mxramstreamprovider.cpp + LEGO1/omni/src/stream/mxstreamchunk.cpp + LEGO1/omni/src/stream/mxstreamcontroller.cpp + LEGO1/omni/src/stream/mxstreamer.cpp + LEGO1/omni/src/stream/mxstreamlist.cpp + LEGO1/omni/src/stream/mxstreamprovider.cpp + LEGO1/omni/src/system/mxautolocker.cpp + LEGO1/omni/src/system/mxcriticalsection.cpp + LEGO1/omni/src/system/mxscheduler.cpp + LEGO1/omni/src/system/mxsemaphore.cpp + LEGO1/omni/src/system/mxthread.cpp + LEGO1/omni/src/video/mxbitmap.cpp + LEGO1/omni/src/video/mxdisplaysurface.cpp + LEGO1/omni/src/video/mxpalette.cpp + LEGO1/omni/src/video/mxregion.cpp + LEGO1/omni/src/video/mxregioncursor.cpp + LEGO1/omni/src/video/mxsmack.cpp + LEGO1/omni/src/video/mxstillpresenter.cpp + LEGO1/omni/src/video/mxtransitionmanager.cpp + LEGO1/omni/src/video/mxvideoparam.cpp + LEGO1/omni/src/video/mxvideoparamflags.cpp LEGO1/realtime/matrix.cpp LEGO1/realtime/orientableroi.cpp LEGO1/realtime/realtime.cpp LEGO1/realtime/realtimeview.cpp LEGO1/realtime/vector.cpp - LEGO1/registrationbook.cpp - LEGO1/res/lego1.rc - LEGO1/score.cpp - LEGO1/scorestate.cpp - LEGO1/skateboard.cpp LEGO1/tgl/d3drm/camera.cpp LEGO1/tgl/d3drm/device.cpp LEGO1/tgl/d3drm/group.cpp @@ -222,8 +220,6 @@ add_library(lego1 SHARED LEGO1/tgl/d3drm/texture.cpp LEGO1/tgl/d3drm/unk.cpp LEGO1/tgl/d3drm/view.cpp - LEGO1/towtrack.cpp - LEGO1/towtrackmissionstate.cpp LEGO1/viewmanager/viewlodlist.cpp LEGO1/viewmanager/viewmanager.cpp LEGO1/viewmanager/viewroi.cpp @@ -232,8 +228,13 @@ if (MINGW) target_compile_definitions(lego1 PRIVATE DIRECTINPUT_VERSION=0x0500) endif() -# Additional include directories target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/util") +target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1") +target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include") +target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources") +target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include") + +# Additional include directories target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/3rdparty/vec") target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/flic") target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smack") @@ -272,9 +273,10 @@ if (ISLE_BUILD_APP) ) target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/util") - - # Include LEGO1 headers in ISLE target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1") + target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include") + target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources") + target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include") # Use internal DirectX 5 if required if (ISLE_USE_DX5) diff --git a/LEGO1/buildingentity.cpp b/LEGO1/buildingentity.cpp deleted file mode 100644 index 37a09f2f..00000000 --- a/LEGO1/buildingentity.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "buildingentity.h" - -// STUB: LEGO1 0x10014e20 -BuildingEntity::BuildingEntity() -{ - // TODO -} - -// STUB: LEGO1 0x10015030 -BuildingEntity::~BuildingEntity() -{ - // TODO -} diff --git a/LEGO1/buildingentity.h b/LEGO1/buildingentity.h deleted file mode 100644 index 7f2abe07..00000000 --- a/LEGO1/buildingentity.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef BUILDINGENTITY_H -#define BUILDINGENTITY_H - -#include "legoentity.h" - -// VTABLE: LEGO1 0x100d5c88 -// SIZE <= 0x68, hard to tell because it's always constructed as a derivative -class BuildingEntity : public LegoEntity { -public: - BuildingEntity(); - virtual ~BuildingEntity() override; // vtable+0x0 - - // FUNCTION: LEGO1 0x10014f20 - inline virtual const char* ClassName() const override // vtable+0x0c - { - // STRING: LEGO1 0x100f07e8 - return "BuildingEntity"; - } - - // FUNCTION: LEGO1 0x10014f30 - inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10 - { - return !strcmp(p_name, BuildingEntity::ClassName()) || LegoEntity::IsA(p_name); - } -}; - -#endif // BUILDINGENTITY_H diff --git a/LEGO1/dunebuggy.cpp b/LEGO1/dunebuggy.cpp deleted file mode 100644 index a32b612d..00000000 --- a/LEGO1/dunebuggy.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "dunebuggy.h" - -#include "decomp.h" - -DECOMP_SIZE_ASSERT(DuneBuggy, 0x16c); - -// FUNCTION: LEGO1 0x10067bb0 -DuneBuggy::DuneBuggy() -{ - this->m_unk0x13c = 25.0; - this->m_unk0x164 = 1.0; -} diff --git a/LEGO1/dunebuggy.h b/LEGO1/dunebuggy.h deleted file mode 100644 index e45fe8fe..00000000 --- a/LEGO1/dunebuggy.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef DUNEBUGGY_H -#define DUNEBUGGY_H - -#include "decomp.h" -#include "islepathactor.h" - -// VTABLE: LEGO1 0x100d8f98 -// SIZE 0x16c -class DuneBuggy : public IslePathActor { -public: - DuneBuggy(); - - // FUNCTION: LEGO1 0x10067c30 - inline virtual const char* ClassName() const override // vtable+0x0c - { - // STRING: LEGO1 0x100f0410 - return "DuneBuggy"; - } - - // FUNCTION: LEGO1 0x10067c40 - inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10 - { - return !strcmp(p_name, DuneBuggy::ClassName()) || IslePathActor::IsA(p_name); - } - -private: - // TODO: Double check DuneBuggy field types - undefined4 m_unk0x160; - MxFloat m_unk0x164; - undefined4 m_unk0x168; -}; - -#endif // DUNEBUGGY_H diff --git a/LEGO1/helicopter.cpp b/LEGO1/helicopter.cpp deleted file mode 100644 index 87ee1dcb..00000000 --- a/LEGO1/helicopter.cpp +++ /dev/null @@ -1,370 +0,0 @@ -#include "helicopter.h" - -#include "act1state.h" -#include "act3.h" -#include "isle.h" -#include "legoanimationmanager.h" -#include "legocontrolmanager.h" -#include "legogamestate.h" -#include "legoomni.h" -#include "legoutil.h" -#include "legoworld.h" -#include "mxtransitionmanager.h" - -DECOMP_SIZE_ASSERT(Helicopter, 0x230) - -// FUNCTION: LEGO1 0x10001e60 -Helicopter::Helicopter() -{ - m_unk0x13c = 60; -} - -// FUNCTION: LEGO1 0x10003230 -Helicopter::~Helicopter() -{ - ControlManager()->Unregister(this); - IslePathActor::Destroy(TRUE); -} - -// FUNCTION: LEGO1 0x100032c0 -MxResult Helicopter::Create(MxDSObject& p_dsObject) -{ - MxResult result = IslePathActor::Create(p_dsObject); - LegoWorld* world = GetCurrentWorld(); - SetWorld(world); - if (world->IsA("Act3")) { - ((Act3*) GetWorld())->SetUnkown420c(this); - } - world = GetWorld(); - if (world) - world->VTable0x58(this); - GetState(); - return result; -} - -// FUNCTION: LEGO1 0x10003320 -void Helicopter::GetState() -{ - m_state = (HelicopterState*) GameState()->GetState("HelicopterState"); - if (!m_state) - m_state = (HelicopterState*) GameState()->CreateState("HelicopterState"); -} - -// FUNCTION: LEGO1 0x10003360 -void Helicopter::VTable0xe4() -{ - if (!GameState()->GetUnknown10()) { - VTable0xe8(0x28, TRUE, 7); - } - IslePathActor::VTable0xe4(); - if (!GameState()->GetUnknown10()) { - GameState()->SetUnknown424(0x3c); - if (GetCurrentVehicle()) { - if (GetCurrentVehicle()->IsA("IslePathActor")) { - ((IslePathActor*) GetCurrentVehicle())->VTable0xe8(0x37, TRUE, 7); - } - } - } - m_state->SetUnknown8(0); - FUN_1003ee00(m_script, 0x16); - FUN_1003ee00(m_script, 0x17); - FUN_1003ee00(m_script, 0x18); - FUN_1003ee00(m_script, 0x19); - FUN_1003ee00(m_script, 0x1a); - FUN_1003ee00(m_script, 0x1b); - FUN_1003ee00(m_script, 0x1c); - FUN_1003ee00(m_script, 0x1d); - FUN_1003ee00(m_script, 0x1e); - FUN_1003ee00(m_script, 0x1f); - AnimationManager()->FUN_1005f6d0(TRUE); - ControlManager()->Unregister(this); -} - -// FUNCTION: LEGO1 0x10003480 -MxU32 Helicopter::VTable0xcc() -{ - if (!FUN_1003ef60()) - return 1; - if (!m_world) - m_world = GetCurrentWorld(); - AnimationManager()->FUN_1005f6d0(FALSE); - if (GetCurrentVehicle()) { - if (GetCurrentVehicle()->VTable0x60() != GameState()->GetUnknownC()) { - GetCurrentVehicle()->VTable0xe4(); - } - } - switch (GameState()->GetUnknown10()) { - case 0: - m_script = *g_isleScript; - AnimationManager()->FUN_10064670(FALSE); - VTable0xe8(0x29, TRUE, 7); - ((Isle*) GetCurrentWorld())->SetUnknown13c(0x3c); - FUN_10015820(1, 0); - TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, TRUE); - SetUnknownDC(4); - PlayMusic(9); - break; - case 1: - m_script = *g_act2mainScript; - break; - case 2: - m_script = *g_act3Script; - break; - } - VTable0xe0(); - InvokeAction(ExtraActionType_start, m_script, 0x15, NULL); - GetCurrentAction().SetObjectId(-1); - ControlManager()->Register(this); - return 1; -} - -// FUNCTION: LEGO1 0x100035e0 -MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param) -{ - MxU32 ret = 0; - MxAtomId script; - switch (GameState()->GetUnknown10()) { - case 0: - script = *g_isleScript; - break; - case 1: - script = *g_act2mainScript; - break; - case 2: - script = *g_act3Script; - break; - } - if (p_param.GetUnknown28() == 1) { - switch (p_param.GetUnknown20()) { - case 0x17: - if (*g_act3Script == script) { - ((Act3*) GetCurrentWorld())->SetUnkown4270(2); - TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE); - } - else if (m_state->GetUnkown8() != 0) - break; - VTable0xe4(); - GameState()->SetUnknown424(0x42); - ret = 1; - break; - case 0x18: { - if (*g_act3Script == script) - break; - Act1State* state = (Act1State*) GameState()->GetState("Act1State"); - if (m_state->GetUnkown8() == 0) { - state->SetUnknown18(4); - m_state->SetUnknown8(1); - m_world->FUN_1001fc80(this); - InvokeAction(ExtraActionType_start, script, 0x20, NULL); - SetUnknownDC(0); - } - ret = 1; - break; - } - case 0x19: - if (*g_act3Script == script) - break; - if (m_state->GetUnkown8() == 2) { - m_state->SetUnknown8(3); - m_world->FUN_1001fc80(this); - InvokeAction(ExtraActionType_start, script, 0x21, NULL); - SetUnknownDC(4); - } - ret = 1; - break; - case 0x1a: - if (*g_act3Script != script) - break; - ret = 1; - /* fall through */ - case 0x1b: - if (*g_act3Script != script) - break; - if (m_world && m_world->GetCamera()) { - Vector3Data loc, dir, lookat; - loc.CopyFrom(m_world->GetCamera()->FUN_100127f0()); - dir.CopyFrom(m_world->GetCamera()->FUN_100128a0()); - lookat = dir; - float scale = 3; - lookat.Mul(scale); - lookat.Add(&loc); - Vector3Data v68, v7c, v90(0, 1, 0), va4; - v68.CopyFrom(m_world->GetCamera()->FUN_10012740()); - va4.EqualsCross(v68, dir); - v7c.EqualsCross(va4, v90); - if (ret) - if (m_world->FUN_100727e0(m_unk0x138, loc, dir, v7c)) - break; - else if (m_world->FUN_10072980(m_unk0x138, loc, dir, v7c)) - break; - } - ret = 1; - break; - case 0x1c: - if (GameState()->GetUnknown10() == 0) { - ((Isle*) GetCurrentWorld())->SetUnknown13c(2); - TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE); - VTable0xe4(); - } - ret = 1; - break; - case 0x1d: - ret = 1; - break; - } - } - return ret; -} - -// FUNCTION: LEGO1 0x10003c20 -MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param) -{ - switch (m_state->GetUnkown8()) { - case 1: { - if (GameState()->GetUnknown10() == 0) { - ((Act1State*) GameState()->GetState("Act1State"))->SetUnknown18(4); - VTable0xe8(0x2a, TRUE, 7); - } - else - VTable0xe8(0x31, TRUE, 7); - m_state->SetUnknown8(2); - Matrix4Data mat; - mat.SetIdentity(); - Matrix4 mat2 = mat.GetMatrix(); - float s = sin(0.5235987901687622); // PI / 6, 30 deg - float c = cos(0.5235987901687622); // PI / 6, 30 deg - for (MxS32 i = 0; i < 4; i++) { - mat.GetMatrix()[i][1] = mat2[i][1] * c - mat2[i][2] * s; - mat.GetMatrix()[i][2] = mat2[i][2] * c + mat2[i][1] * s; - } - Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]); - m_world->GetCamera()->LookAt(at, dir, up); - FUN_10010c30(); - break; - } - case 3: { - Matrix4Data mat; - mat.SetIdentity(); - Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]); - at[1] = 1.25; - m_world->GetCamera()->LookAt(at, dir, up); - if (GameState()->GetUnknown10() == 0) { - ((Act1State*) GameState()->GetState("Act1State"))->SetUnknown18(0); - VTable0xe8(0x29, TRUE, 7); - } - else - VTable0xe8(0x30, TRUE, 7); - m_state->SetUnknown8(0); - break; - } - default: - return 0; - } - return 1; -} - -// FUNCTION: LEGO1 0x10003e90 -void Helicopter::VTable0x74(Matrix4Impl& p_transform) -{ - if (m_unk0xea != 0) { - m_roi->FUN_100a46b0(p_transform); - FUN_10010c30(); - } - else { - m_roi->FUN_100a58f0(p_transform); - m_roi->VTable0x14(); - if (m_cameraFlag) - FUN_10010c30(); - } -} - -// FUNCTION: LEGO1 0x10003ee0 -void Helicopter::VTable0x70(float p_float) -{ - MxU32 state = m_state->GetUnkown8(); - switch (state) { - default: - LegoPathActor::VTable0x70(p_float); - return; - case 4: - case 5: - float f = m_unk0x1f0 - p_float + 3000; - if (f >= 0) { - float f2 = f / 3000 + 1; - if (f2 < 0) - f2 = 0; - if (1.0f < f2) - f2 = 1.0f; - Vector3Impl v(m_unk0x160.GetMatrix()[3]); - Matrix4Data mat; - Vector3Impl v2(m_unk0x1a8.GetMatrix()[3]); - float* loc = m_unk0x1a8.GetMatrix()[3]; - mat.SetIdentity(); - float fa[4]; - Vector4Impl v3(fa); - if (m_unk0x1f4.FUN_100040a0(v3, f2) == SUCCESS) { - mat.FromQuaternion(v3); - } - v2.SetVector(loc); - v2.Sub(&v); - v2.Mul(f2); - v2.Add(&v); - m_world->GetCamera()->FUN_100123e0(mat, 0); - } - else { - if (state == 4) - m_world->FUN_10073400(); - else - m_world->FUN_10073430(); - m_unk0xdc = 4; - } - } -} - -// FUNCTION: LEGO1 0x100040a0 -MxResult HelicopterSubclass::FUN_100040a0(Vector4Impl& p_v, float p_f) -{ - MxU32 state = m_unk0x30; - if (state == 1) { - p_v.EqualsImpl(m_unk0x0.GetVector().elements); - p_v[3] = acos(p_v[3]) * (1 - p_f) * 2.0; - return p_v.NormalizeQuaternion(); - } - else if (state == 2) { - p_v.EqualsImpl(m_unk0x18.GetVector().elements); - p_v[3] = acos(p_v[3]) * p_f * 2.0; - p_v.NormalizeQuaternion(); - return p_v.NormalizeQuaternion(); - } - else if (state == 3) { - double d1 = p_v.Dot(&m_unk0x0, &m_unk0x18), d2; - if (d1 + 1 > 0.00001) { - if (1 - d1 > 0.00001) { - double d = acos(d1); - sin(d); - d1 = sin((1 - p_f) * d) / sin(d); - d2 = sin(p_f * d) / sin(d); - } - else { - d1 = 1 - p_f; - d2 = p_f; - } - for (MxS32 i = 0; i < 4; i++) { - p_v[i] = m_unk0x18[i] * d2 + m_unk0x0[i] * d1; - } - return SUCCESS; - } - p_v[0] = -m_unk0x0[1]; - p_v[1] = m_unk0x0[1]; - p_v[2] = -m_unk0x0[3]; - p_v[3] = m_unk0x0[2]; - d1 = sin((1 - p_f) * 1.570796326794895); - d2 = sin(p_f * 1.570796326794895); - for (MxS32 i = 0; i < 3; i++) { - p_v[i] = m_unk0x0[i] * d1 + p_v[i] * d2; - } - return SUCCESS; - } - else - return FAILURE; -} diff --git a/LEGO1/helicopter.h b/LEGO1/helicopter.h deleted file mode 100644 index 7c5be4ea..00000000 --- a/LEGO1/helicopter.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef HELICOPTER_H -#define HELICOPTER_H - -#include "helicopterstate.h" -#include "islepathactor.h" -#include "realtime/matrix.h" - -// SIZE 0x34 -class HelicopterSubclass { -public: - inline HelicopterSubclass() : m_unk0x30(0) {} - MxResult FUN_100040a0(Vector4Impl& p_v, float p_f); - -private: - Vector4Data m_unk0x0; // 0x0 - Vector4Data m_unk0x18; // 0x18 - undefined4 m_unk0x30; // 0x30 -}; - -// VTABLE: LEGO1 0x100d40f8 -// SIZE 0x230 -class Helicopter : public IslePathActor { -public: - Helicopter(); - virtual ~Helicopter() override; // vtable+0x0 - - // FUNCTION: LEGO1 0x10003070 - inline virtual const char* ClassName() const override // vtable+0x0c - { - // STRING: LEGO1 0x100f0130 - return "Helicopter"; - } - - // FUNCTION: LEGO1 0x10003080 - inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10 - { - return !strcmp(p_name, Helicopter::ClassName()) || IslePathActor::IsA(p_name); - } - - virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18 - void VTable0x70(float p_float) override; // vtable+0x70 - void VTable0x74(Matrix4Impl& p_transform) override; // vtable+0x74 - virtual MxU32 VTable0xcc() override; // vtable+0xcc - virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4 - virtual MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8 - virtual void VTable0xe4() override; // vtable+0xe4 - - // SYNTHETIC: LEGO1 0x10003210 - // Helicopter::`scalar deleting destructor' - -protected: - Matrix4Data m_unk0x160; // 0x160 - Matrix4Data m_unk0x1a8; // 0x1a8 - float m_unk0x1f0; // 0x1f0 - HelicopterSubclass m_unk0x1f4; // 0x1f4 - HelicopterState* m_state; // 0x228 - MxAtomId m_script; // 0x22c - -private: - void GetState(); -}; - -#endif // HELICOPTER_H diff --git a/LEGO1/helicopterstate.cpp b/LEGO1/helicopterstate.cpp deleted file mode 100644 index 70d71a0c..00000000 --- a/LEGO1/helicopterstate.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "helicopterstate.h" diff --git a/LEGO1/helicopterstate.h b/LEGO1/helicopterstate.h deleted file mode 100644 index 2cb3b747..00000000 --- a/LEGO1/helicopterstate.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef HELICOPTERSTATE_H -#define HELICOPTERSTATE_H - -#include "decomp.h" -#include "legostate.h" - -// VTABLE: LEGO1 0x100d5418 -// SIZE 0xc -class HelicopterState : public LegoState { -public: - // FUNCTION: LEGO1 0x1000e0d0 - inline virtual const char* ClassName() const override // vtable+0x0c - { - // STRING: LEGO1 0x100f0144 - return "HelicopterState"; - } - - // FUNCTION: LEGO1 0x1000e0e0 - inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10 - { - return !strcmp(p_name, HelicopterState::ClassName()) || LegoState::IsA(p_name); - } - - inline void SetUnknown8(MxU32 p_unk0x8) { m_unk0x8 = p_unk0x8; } - inline MxU32 GetUnkown8() { return m_unk0x8; } - -protected: - MxU32 m_unk0x8; // 0x8 -}; - -#endif // HELICOPTERSTATE_H diff --git a/LEGO1/jetski.cpp b/LEGO1/jetski.cpp deleted file mode 100644 index 8bdf3fff..00000000 --- a/LEGO1/jetski.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "jetski.h" - -DECOMP_SIZE_ASSERT(Jetski, 0x164); - -// FUNCTION: LEGO1 0x1007e3b0 -Jetski::Jetski() -{ - this->m_unk0x13c = 25.0; - this->m_unk0x150 = 2.0; - this->m_unk0x148 = 1; -} diff --git a/LEGO1/jetski.h b/LEGO1/jetski.h deleted file mode 100644 index 1a64a4b6..00000000 --- a/LEGO1/jetski.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef JETSKI_H -#define JETSKI_H - -#include "decomp.h" -#include "islepathactor.h" - -// VTABLE: LEGO1 0x100d9ec8 -// SIZE 0x164 -class Jetski : public IslePathActor { -public: - Jetski(); - - // FUNCTION: LEGO1 0x1007e430 - inline virtual const char* ClassName() const override // vtable+0x0c - { - // STRING: LEGO1 0x100f03d8 - return "Jetski"; - } - - // FUNCTION: LEGO1 0x1007e440 - inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10 - { - return !strcmp(p_name, Jetski::ClassName()) || IslePathActor::IsA(p_name); - } - -private: - // TODO: Jetski fields - undefined m_unk0x160[4]; -}; - -#endif // JETSKI_H diff --git a/LEGO1/extra.h b/LEGO1/lego/legoomni/include/extra.h similarity index 100% rename from LEGO1/extra.h rename to LEGO1/lego/legoomni/include/extra.h diff --git a/LEGO1/gifmanager.h b/LEGO1/lego/legoomni/include/gifmanager.h similarity index 100% rename from LEGO1/gifmanager.h rename to LEGO1/lego/legoomni/include/gifmanager.h diff --git a/LEGO1/lego3dwavepresenter.h b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h similarity index 100% rename from LEGO1/lego3dwavepresenter.h rename to LEGO1/lego/legoomni/include/lego3dwavepresenter.h diff --git a/LEGO1/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h similarity index 100% rename from LEGO1/legoactioncontrolpresenter.h rename to LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h diff --git a/LEGO1/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h similarity index 100% rename from LEGO1/legoactor.h rename to LEGO1/lego/legoomni/include/legoactor.h diff --git a/LEGO1/legoactorpresenter.h b/LEGO1/lego/legoomni/include/legoactorpresenter.h similarity index 100% rename from LEGO1/legoactorpresenter.h rename to LEGO1/lego/legoomni/include/legoactorpresenter.h diff --git a/LEGO1/legoanimactor.h b/LEGO1/lego/legoomni/include/legoanimactor.h similarity index 100% rename from LEGO1/legoanimactor.h rename to LEGO1/lego/legoomni/include/legoanimactor.h diff --git a/LEGO1/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h similarity index 100% rename from LEGO1/legoanimationmanager.h rename to LEGO1/lego/legoomni/include/legoanimationmanager.h diff --git a/LEGO1/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h similarity index 100% rename from LEGO1/legoanimmmpresenter.h rename to LEGO1/lego/legoomni/include/legoanimmmpresenter.h diff --git a/LEGO1/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h similarity index 100% rename from LEGO1/legoanimpresenter.h rename to LEGO1/lego/legoomni/include/legoanimpresenter.h diff --git a/LEGO1/legobackgroundcolor.h b/LEGO1/lego/legoomni/include/legobackgroundcolor.h similarity index 100% rename from LEGO1/legobackgroundcolor.h rename to LEGO1/lego/legoomni/include/legobackgroundcolor.h diff --git a/LEGO1/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h similarity index 100% rename from LEGO1/legobuildingmanager.h rename to LEGO1/lego/legoomni/include/legobuildingmanager.h diff --git a/LEGO1/legocachesound.h b/LEGO1/lego/legoomni/include/legocachesound.h similarity index 100% rename from LEGO1/legocachesound.h rename to LEGO1/lego/legoomni/include/legocachesound.h diff --git a/LEGO1/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h similarity index 100% rename from LEGO1/legocameracontroller.h rename to LEGO1/lego/legoomni/include/legocameracontroller.h diff --git a/LEGO1/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h similarity index 100% rename from LEGO1/legocarbuild.h rename to LEGO1/lego/legoomni/include/legocarbuild.h diff --git a/LEGO1/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h similarity index 100% rename from LEGO1/legocarbuildanimpresenter.h rename to LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h diff --git a/LEGO1/legocarraceactor.h b/LEGO1/lego/legoomni/include/legocarraceactor.h similarity index 100% rename from LEGO1/legocarraceactor.h rename to LEGO1/lego/legoomni/include/legocarraceactor.h diff --git a/LEGO1/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h similarity index 100% rename from LEGO1/legocontrolmanager.h rename to LEGO1/lego/legoomni/include/legocontrolmanager.h diff --git a/LEGO1/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h similarity index 99% rename from LEGO1/legoentity.h rename to LEGO1/lego/legoomni/include/legoentity.h index 5a2eb715..ba0e1a7b 100644 --- a/LEGO1/legoentity.h +++ b/LEGO1/lego/legoomni/include/legoentity.h @@ -3,10 +3,10 @@ #include "decomp.h" #include "extra.h" -#include "legoroi.h" #include "mxdsobject.h" #include "mxentity.h" #include "realtime/vector.h" +#include "roi/legoroi.h" // VTABLE: LEGO1 0x100d4858 // SIZE 0x68 (probably) diff --git a/LEGO1/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h similarity index 100% rename from LEGO1/legoentitypresenter.h rename to LEGO1/lego/legoomni/include/legoentitypresenter.h diff --git a/LEGO1/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h similarity index 100% rename from LEGO1/legoeventnotificationparam.h rename to LEGO1/lego/legoomni/include/legoeventnotificationparam.h diff --git a/LEGO1/legoextraactor.h b/LEGO1/lego/legoomni/include/legoextraactor.h similarity index 100% rename from LEGO1/legoextraactor.h rename to LEGO1/lego/legoomni/include/legoextraactor.h diff --git a/LEGO1/legoflctexturepresenter.h b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h similarity index 100% rename from LEGO1/legoflctexturepresenter.h rename to LEGO1/lego/legoomni/include/legoflctexturepresenter.h diff --git a/LEGO1/legofullscreenmovie.h b/LEGO1/lego/legoomni/include/legofullscreenmovie.h similarity index 100% rename from LEGO1/legofullscreenmovie.h rename to LEGO1/lego/legoomni/include/legofullscreenmovie.h diff --git a/LEGO1/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h similarity index 100% rename from LEGO1/legogamestate.h rename to LEGO1/lego/legoomni/include/legogamestate.h diff --git a/LEGO1/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h similarity index 100% rename from LEGO1/legohideanimpresenter.h rename to LEGO1/lego/legoomni/include/legohideanimpresenter.h diff --git a/LEGO1/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h similarity index 100% rename from LEGO1/legoinputmanager.h rename to LEGO1/lego/legoomni/include/legoinputmanager.h diff --git a/LEGO1/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h similarity index 100% rename from LEGO1/legojetski.h rename to LEGO1/lego/legoomni/include/legojetski.h diff --git a/LEGO1/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h similarity index 100% rename from LEGO1/legojetskiraceactor.h rename to LEGO1/lego/legoomni/include/legojetskiraceactor.h diff --git a/LEGO1/legoloadcachesoundpresenter.h b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h similarity index 100% rename from LEGO1/legoloadcachesoundpresenter.h rename to LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h diff --git a/LEGO1/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h similarity index 100% rename from LEGO1/legolocomotionanimpresenter.h rename to LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h diff --git a/LEGO1/legoloopinganimpresenter.h b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h similarity index 100% rename from LEGO1/legoloopinganimpresenter.h rename to LEGO1/lego/legoomni/include/legoloopinganimpresenter.h diff --git a/LEGO1/legometerpresenter.h b/LEGO1/lego/legoomni/include/legometerpresenter.h similarity index 100% rename from LEGO1/legometerpresenter.h rename to LEGO1/lego/legoomni/include/legometerpresenter.h diff --git a/LEGO1/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h similarity index 100% rename from LEGO1/legomodelpresenter.h rename to LEGO1/lego/legoomni/include/legomodelpresenter.h diff --git a/LEGO1/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h similarity index 100% rename from LEGO1/legonavcontroller.h rename to LEGO1/lego/legoomni/include/legonavcontroller.h diff --git a/LEGO1/legoobjectfactory.h b/LEGO1/lego/legoomni/include/legoobjectfactory.h similarity index 100% rename from LEGO1/legoobjectfactory.h rename to LEGO1/lego/legoomni/include/legoobjectfactory.h diff --git a/LEGO1/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h similarity index 100% rename from LEGO1/legoomni.h rename to LEGO1/lego/legoomni/include/legoomni.h diff --git a/LEGO1/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h similarity index 100% rename from LEGO1/legopalettepresenter.h rename to LEGO1/lego/legoomni/include/legopalettepresenter.h diff --git a/LEGO1/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h similarity index 100% rename from LEGO1/legopartpresenter.h rename to LEGO1/lego/legoomni/include/legopartpresenter.h diff --git a/LEGO1/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h similarity index 100% rename from LEGO1/legopathactor.h rename to LEGO1/lego/legoomni/include/legopathactor.h diff --git a/LEGO1/legopathboundary.h b/LEGO1/lego/legoomni/include/legopathboundary.h similarity index 100% rename from LEGO1/legopathboundary.h rename to LEGO1/lego/legoomni/include/legopathboundary.h diff --git a/LEGO1/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h similarity index 100% rename from LEGO1/legopathcontroller.h rename to LEGO1/lego/legoomni/include/legopathcontroller.h diff --git a/LEGO1/legopathcontrollerlist.h b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h similarity index 100% rename from LEGO1/legopathcontrollerlist.h rename to LEGO1/lego/legoomni/include/legopathcontrollerlist.h diff --git a/LEGO1/legopathpresenter.h b/LEGO1/lego/legoomni/include/legopathpresenter.h similarity index 100% rename from LEGO1/legopathpresenter.h rename to LEGO1/lego/legoomni/include/legopathpresenter.h diff --git a/LEGO1/legophonemepresenter.h b/LEGO1/lego/legoomni/include/legophonemepresenter.h similarity index 100% rename from LEGO1/legophonemepresenter.h rename to LEGO1/lego/legoomni/include/legophonemepresenter.h diff --git a/LEGO1/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h similarity index 100% rename from LEGO1/legoplantmanager.h rename to LEGO1/lego/legoomni/include/legoplantmanager.h diff --git a/LEGO1/legorace.h b/LEGO1/lego/legoomni/include/legorace.h similarity index 100% rename from LEGO1/legorace.h rename to LEGO1/lego/legoomni/include/legorace.h diff --git a/LEGO1/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h similarity index 100% rename from LEGO1/legoraceactor.h rename to LEGO1/lego/legoomni/include/legoraceactor.h diff --git a/LEGO1/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h similarity index 100% rename from LEGO1/legoracecar.h rename to LEGO1/lego/legoomni/include/legoracecar.h diff --git a/LEGO1/legosoundmanager.h b/LEGO1/lego/legoomni/include/legosoundmanager.h similarity index 100% rename from LEGO1/legosoundmanager.h rename to LEGO1/lego/legoomni/include/legosoundmanager.h diff --git a/LEGO1/legostate.h b/LEGO1/lego/legoomni/include/legostate.h similarity index 100% rename from LEGO1/legostate.h rename to LEGO1/lego/legoomni/include/legostate.h diff --git a/LEGO1/legostream.h b/LEGO1/lego/legoomni/include/legostream.h similarity index 100% rename from LEGO1/legostream.h rename to LEGO1/lego/legoomni/include/legostream.h diff --git a/LEGO1/legotexturepresenter.h b/LEGO1/lego/legoomni/include/legotexturepresenter.h similarity index 100% rename from LEGO1/legotexturepresenter.h rename to LEGO1/lego/legoomni/include/legotexturepresenter.h diff --git a/LEGO1/mxunknown100d7c88.h b/LEGO1/lego/legoomni/include/legounknown100d7c88.h similarity index 59% rename from LEGO1/mxunknown100d7c88.h rename to LEGO1/lego/legoomni/include/legounknown100d7c88.h index eccc6ee4..a6004053 100644 --- a/LEGO1/mxunknown100d7c88.h +++ b/LEGO1/lego/legoomni/include/legounknown100d7c88.h @@ -1,12 +1,12 @@ -#ifndef MXUNKNOWN100D7C88_H -#define MXUNKNOWN100D7C88_H +#ifndef LEGOUNKNOWN100D7C88_H +#define LEGOUNKNOWN100D7C88_H #include "decomp.h" #include "mxstring.h" -class MxUnknown100d7c88 { +class LegoUnknown100d7c88 { public: - ~MxUnknown100d7c88(); + ~LegoUnknown100d7c88(); virtual undefined4 VTable0x00(); // vtable+0x00 // More virtual functions @@ -16,4 +16,4 @@ class MxUnknown100d7c88 { undefined4 m_unk0x14; // 0x14 }; -#endif // MXUNKNOWN100D7C88_H +#endif // LEGOUNKNOWN100D7C88_H diff --git a/LEGO1/lego/legoomni/include/legounknown100d9d00.h b/LEGO1/lego/legoomni/include/legounknown100d9d00.h new file mode 100644 index 00000000..d31634fe --- /dev/null +++ b/LEGO1/lego/legoomni/include/legounknown100d9d00.h @@ -0,0 +1,42 @@ +#ifndef LEGOUNKNOWN100D9D00_H +#define LEGOUNKNOWN100D9D00_H + +#include "decomp.h" +#include "legounknown100d7c88.h" +#include "mxlist.h" + +// VTABLE: LEGO1 0x100d9cd0 +// class MxCollection + +// VTABLE: LEGO1 0x100d9ce8 +// class MxList + +// VTABLE: LEGO1 0x100d9d00 +// SIZE 0x18 +class LegoUnknown100d9d00 : public MxList { +public: + LegoUnknown100d9d00() { SetDestroy(Destroy); } + + // STUB: LEGO1 0x1007b210 + virtual MxS8 Compare(LegoUnknown100d7c88* p_a, LegoUnknown100d7c88* p_b) override { return -1; } // vtable+0x14 + + // FUNCTION: LEGO1 0x1007b2e0 + static void Destroy(LegoUnknown100d7c88* p_element) { delete p_element; } +}; + +// TEMPLATE: LEGO1 0x1007b300 +// MxCollection::Compare + +// TEMPLATE: LEGO1 0x1007b360 +// MxCollection::Destroy + +// SYNTHETIC: LEGO1 0x1007b400 +// LegoUnknown100d9d00::`scalar deleting destructor' + +// SYNTHETIC: LEGO1 0x1007b470 +// MxCollection::`scalar deleting destructor' + +// SYNTHETIC: LEGO1 0x1007b4e0 +// MxList::`scalar deleting destructor' + +#endif // LEGOUNKNOWN100D9D00_H diff --git a/LEGO1/legounksavedatawriter.h b/LEGO1/lego/legoomni/include/legounksavedatawriter.h similarity index 100% rename from LEGO1/legounksavedatawriter.h rename to LEGO1/lego/legoomni/include/legounksavedatawriter.h diff --git a/LEGO1/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h similarity index 100% rename from LEGO1/legoutil.h rename to LEGO1/lego/legoomni/include/legoutil.h diff --git a/LEGO1/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h similarity index 100% rename from LEGO1/legovehiclebuildstate.h rename to LEGO1/lego/legoomni/include/legovehiclebuildstate.h diff --git a/LEGO1/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h similarity index 52% rename from LEGO1/legovideomanager.h rename to LEGO1/lego/legoomni/include/legovideomanager.h index 884b31ad..0783931a 100644 --- a/LEGO1/legovideomanager.h +++ b/LEGO1/lego/legoomni/include/legovideomanager.h @@ -3,9 +3,9 @@ #include "3dmanager/lego3dmanager.h" #include "decomp.h" +#include "legounknown100d9d00.h" #include "mxdirectx/mxdirect3d.h" #include "mxdirectx/mxstopwatch.h" -#include "mxunknown100d9d00.h" #include "mxvideomanager.h" #include @@ -33,7 +33,7 @@ class LegoVideoManager : public MxVideoManager { virtual void VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34 virtual void VTable0x38(undefined4, undefined4); // vtable+0x38 // FUNCTION: LGEO1 0x1007ab10 - virtual MxUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c + virtual LegoUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c void SetSkyColor(float p_red, float p_green, float p_blue); void OverrideSkyColor(MxBool p_shouldOverride); @@ -49,39 +49,39 @@ class LegoVideoManager : public MxVideoManager { inline void DrawCursor(); - Tgl::Renderer* m_renderer; // 0x64 - Lego3DManager* m_3dManager; // 0x68 - LegoROI* m_viewROI; // 0x6c - undefined4 m_unk0x70; // 0x70 - MxDirect3D* m_direct3d; // 0x74 - undefined4 m_unk0x78[27]; // 0x78 - MxBool m_unk0xe4; // 0xe4 - MxBool m_unk0xe5; // 0xe5 - MxBool m_unk0xe6; // 0xe6 - PALETTEENTRY m_paletteEntries[256]; // 0xe7 - undefined m_padding0x4e7; // 0x4e7 - MxUnknown100d9d00* m_unk0x100d9d00; // 0x4e8 - MxBool m_isFullscreenMovie; // 0x4ec - MxPalette* m_palette; // 0x4f0 - MxStopWatch* m_stopWatch; // 0x4f4 - double m_elapsedSeconds; // 0x4f8 - MxBool m_unk0x500; // 0x500 - MxBool m_drawCursor; // 0x501 - MxS32 m_cursorXCopy; // 0x504 - MxS32 m_cursorYCopy; // 0x508 - MxS32 m_cursorX; // 0x50c - MxS32 m_cursorY; // 0x510 - LPDIRECTDRAWSURFACE m_unk0x514; // 0x514 - RECT m_unk0x518; // 0x518 - undefined4 m_unk0x528; // 0x528 - MxBool m_drawFPS; // 0x52c - RECT m_fpsRect; // 0x530 - HFONT m_arialFont; // 0x540 - SIZE m_fpsSize; // 0x544 - undefined m_pad0x54c[8]; // 0x54c - MxBool m_unk0x554; // 0x554 - MxBool m_initialized; // 0x555 - undefined m_pad0x556[0x39]; // 0x556 + Tgl::Renderer* m_renderer; // 0x64 + Lego3DManager* m_3dManager; // 0x68 + LegoROI* m_viewROI; // 0x6c + undefined4 m_unk0x70; // 0x70 + MxDirect3D* m_direct3d; // 0x74 + undefined4 m_unk0x78[27]; // 0x78 + MxBool m_unk0xe4; // 0xe4 + MxBool m_unk0xe5; // 0xe5 + MxBool m_unk0xe6; // 0xe6 + PALETTEENTRY m_paletteEntries[256]; // 0xe7 + undefined m_padding0x4e7; // 0x4e7 + LegoUnknown100d9d00* m_unk0x100d9d00; // 0x4e8 + MxBool m_isFullscreenMovie; // 0x4ec + MxPalette* m_palette; // 0x4f0 + MxStopWatch* m_stopWatch; // 0x4f4 + double m_elapsedSeconds; // 0x4f8 + MxBool m_unk0x500; // 0x500 + MxBool m_drawCursor; // 0x501 + MxS32 m_cursorXCopy; // 0x504 + MxS32 m_cursorYCopy; // 0x508 + MxS32 m_cursorX; // 0x50c + MxS32 m_cursorY; // 0x510 + LPDIRECTDRAWSURFACE m_unk0x514; // 0x514 + RECT m_unk0x518; // 0x518 + undefined4 m_unk0x528; // 0x528 + MxBool m_drawFPS; // 0x52c + RECT m_fpsRect; // 0x530 + HFONT m_arialFont; // 0x540 + SIZE m_fpsSize; // 0x544 + undefined m_pad0x54c[8]; // 0x54c + MxBool m_unk0x554; // 0x554 + MxBool m_initialized; // 0x555 + undefined m_pad0x556[0x39]; // 0x556 }; // SYNTHETIC: LEGO1 0x1007ab20 diff --git a/LEGO1/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h similarity index 100% rename from LEGO1/legoworld.h rename to LEGO1/lego/legoomni/include/legoworld.h diff --git a/LEGO1/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h similarity index 100% rename from LEGO1/legoworldlist.h rename to LEGO1/lego/legoomni/include/legoworldlist.h diff --git a/LEGO1/legoworldpresenter.h b/LEGO1/lego/legoomni/include/legoworldpresenter.h similarity index 100% rename from LEGO1/legoworldpresenter.h rename to LEGO1/lego/legoomni/include/legoworldpresenter.h diff --git a/LEGO1/legocachesound.cpp b/LEGO1/lego/legoomni/src/audio/legocachesound.cpp similarity index 100% rename from LEGO1/legocachesound.cpp rename to LEGO1/lego/legoomni/src/audio/legocachesound.cpp diff --git a/LEGO1/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp similarity index 100% rename from LEGO1/legoloadcachesoundpresenter.cpp rename to LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp diff --git a/LEGO1/legosoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp similarity index 100% rename from LEGO1/legosoundmanager.cpp rename to LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp diff --git a/LEGO1/gifmanager.cpp b/LEGO1/lego/legoomni/src/common/gifmanager.cpp similarity index 100% rename from LEGO1/gifmanager.cpp rename to LEGO1/lego/legoomni/src/common/gifmanager.cpp diff --git a/LEGO1/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp similarity index 100% rename from LEGO1/legoactioncontrolpresenter.cpp rename to LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp diff --git a/LEGO1/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp similarity index 100% rename from LEGO1/legobackgroundcolor.cpp rename to LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp diff --git a/LEGO1/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/common/legocameracontroller.cpp similarity index 100% rename from LEGO1/legocameracontroller.cpp rename to LEGO1/lego/legoomni/src/common/legocameracontroller.cpp diff --git a/LEGO1/legofullscreenmovie.cpp b/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp similarity index 100% rename from LEGO1/legofullscreenmovie.cpp rename to LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp diff --git a/LEGO1/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp similarity index 100% rename from LEGO1/legogamestate.cpp rename to LEGO1/lego/legoomni/src/common/legogamestate.cpp diff --git a/LEGO1/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/common/legonavcontroller.cpp similarity index 100% rename from LEGO1/legonavcontroller.cpp rename to LEGO1/lego/legoomni/src/common/legonavcontroller.cpp diff --git a/LEGO1/legoobjectfactory.cpp b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp similarity index 100% rename from LEGO1/legoobjectfactory.cpp rename to LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp diff --git a/LEGO1/legoplantmanager.cpp b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp similarity index 100% rename from LEGO1/legoplantmanager.cpp rename to LEGO1/lego/legoomni/src/common/legoplantmanager.cpp diff --git a/LEGO1/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp similarity index 100% rename from LEGO1/legostate.cpp rename to LEGO1/lego/legoomni/src/common/legostate.cpp diff --git a/LEGO1/legostream.cpp b/LEGO1/lego/legoomni/src/common/legostream.cpp similarity index 100% rename from LEGO1/legostream.cpp rename to LEGO1/lego/legoomni/src/common/legostream.cpp diff --git a/LEGO1/legounksavedatawriter.cpp b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp similarity index 100% rename from LEGO1/legounksavedatawriter.cpp rename to LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp diff --git a/LEGO1/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp similarity index 100% rename from LEGO1/legoutil.cpp rename to LEGO1/lego/legoomni/src/common/legoutil.cpp diff --git a/LEGO1/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp similarity index 100% rename from LEGO1/legocontrolmanager.cpp rename to LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp diff --git a/LEGO1/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp similarity index 100% rename from LEGO1/legoactor.cpp rename to LEGO1/lego/legoomni/src/entity/legoactor.cpp diff --git a/LEGO1/legoanimactor.cpp b/LEGO1/lego/legoomni/src/entity/legoanimactor.cpp similarity index 100% rename from LEGO1/legoanimactor.cpp rename to LEGO1/lego/legoomni/src/entity/legoanimactor.cpp diff --git a/LEGO1/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp similarity index 100% rename from LEGO1/legoentity.cpp rename to LEGO1/lego/legoomni/src/entity/legoentity.cpp diff --git a/LEGO1/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp similarity index 100% rename from LEGO1/legoentitypresenter.cpp rename to LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp diff --git a/LEGO1/legojetski.cpp b/LEGO1/lego/legoomni/src/entity/legojetski.cpp similarity index 100% rename from LEGO1/legojetski.cpp rename to LEGO1/lego/legoomni/src/entity/legojetski.cpp diff --git a/LEGO1/legopathactor.cpp b/LEGO1/lego/legoomni/src/entity/legopathactor.cpp similarity index 100% rename from LEGO1/legopathactor.cpp rename to LEGO1/lego/legoomni/src/entity/legopathactor.cpp diff --git a/LEGO1/legorace.cpp b/LEGO1/lego/legoomni/src/entity/legorace.cpp similarity index 100% rename from LEGO1/legorace.cpp rename to LEGO1/lego/legoomni/src/entity/legorace.cpp diff --git a/LEGO1/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp similarity index 100% rename from LEGO1/legoworld.cpp rename to LEGO1/lego/legoomni/src/entity/legoworld.cpp diff --git a/LEGO1/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp similarity index 100% rename from LEGO1/legoworldpresenter.cpp rename to LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp diff --git a/LEGO1/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp similarity index 100% rename from LEGO1/legoinputmanager.cpp rename to LEGO1/lego/legoomni/src/input/legoinputmanager.cpp diff --git a/LEGO1/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp similarity index 100% rename from LEGO1/legoomni.cpp rename to LEGO1/lego/legoomni/src/main/legoomni.cpp diff --git a/LEGO1/legoeventnotificationparam.cpp b/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp similarity index 100% rename from LEGO1/legoeventnotificationparam.cpp rename to LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp diff --git a/LEGO1/legopathcontroller.cpp b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp similarity index 100% rename from LEGO1/legopathcontroller.cpp rename to LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp diff --git a/LEGO1/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp similarity index 100% rename from LEGO1/legopathpresenter.cpp rename to LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp diff --git a/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp b/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp new file mode 100644 index 00000000..b3f386e3 --- /dev/null +++ b/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp @@ -0,0 +1,12 @@ +#include "legounknown100d7c88.h" + +// FUNCTION: LEGO1 0x10044e50 +LegoUnknown100d7c88::~LegoUnknown100d7c88() +{ +} + +// FUNCTION: LEGO1 0x10044eb0 +MxU32 LegoUnknown100d7c88::VTable0x00() +{ + return m_unk0x14; +} diff --git a/LEGO1/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp similarity index 100% rename from LEGO1/legoanimationmanager.cpp rename to LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp diff --git a/LEGO1/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp similarity index 100% rename from LEGO1/legoanimmmpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp diff --git a/LEGO1/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp similarity index 100% rename from LEGO1/legoanimpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp diff --git a/LEGO1/legocarbuildanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp similarity index 100% rename from LEGO1/legocarbuildanimpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp diff --git a/LEGO1/legoflctexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp similarity index 100% rename from LEGO1/legoflctexturepresenter.cpp rename to LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp diff --git a/LEGO1/legohideanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp similarity index 100% rename from LEGO1/legohideanimpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp diff --git a/LEGO1/legolocomotionanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp similarity index 100% rename from LEGO1/legolocomotionanimpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp diff --git a/LEGO1/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp similarity index 100% rename from LEGO1/legometerpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legometerpresenter.cpp diff --git a/LEGO1/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp similarity index 100% rename from LEGO1/legomodelpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp diff --git a/LEGO1/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp similarity index 100% rename from LEGO1/legopalettepresenter.cpp rename to LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp diff --git a/LEGO1/legopartpresenter.cpp b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp similarity index 100% rename from LEGO1/legopartpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legopartpresenter.cpp diff --git a/LEGO1/legophonemepresenter.cpp b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp similarity index 100% rename from LEGO1/legophonemepresenter.cpp rename to LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp diff --git a/LEGO1/legotexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp similarity index 100% rename from LEGO1/legotexturepresenter.cpp rename to LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp similarity index 99% rename from LEGO1/legovideomanager.cpp rename to LEGO1/lego/legoomni/src/video/legovideomanager.cpp index 78f3788e..f44d1738 100644 --- a/LEGO1/legovideomanager.cpp +++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp @@ -178,7 +178,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM m_3dManager->Add(*m_viewROI); m_3dManager->SetPointOfView(*m_viewROI); - m_unk0x100d9d00 = new MxUnknown100d9d00; + m_unk0x100d9d00 = new LegoUnknown100d9d00; m_unk0xe4 = FALSE; m_stopWatch = new MxStopWatch; m_stopWatch->Start(); diff --git a/LEGO1/act1state.cpp b/LEGO1/lego/scripts/act1/act1state.cpp similarity index 100% rename from LEGO1/act1state.cpp rename to LEGO1/lego/scripts/act1/act1state.cpp diff --git a/LEGO1/act1state.h b/LEGO1/lego/scripts/act1/act1state.h similarity index 100% rename from LEGO1/act1state.h rename to LEGO1/lego/scripts/act1/act1state.h diff --git a/LEGO1/act2brick.cpp b/LEGO1/lego/scripts/act2/act2brick.cpp similarity index 100% rename from LEGO1/act2brick.cpp rename to LEGO1/lego/scripts/act2/act2brick.cpp diff --git a/LEGO1/act2brick.h b/LEGO1/lego/scripts/act2/act2brick.h similarity index 100% rename from LEGO1/act2brick.h rename to LEGO1/lego/scripts/act2/act2brick.h diff --git a/LEGO1/act2policestation.cpp b/LEGO1/lego/scripts/act2/act2policestation.cpp similarity index 100% rename from LEGO1/act2policestation.cpp rename to LEGO1/lego/scripts/act2/act2policestation.cpp diff --git a/LEGO1/act2policestation.h b/LEGO1/lego/scripts/act2/act2policestation.h similarity index 100% rename from LEGO1/act2policestation.h rename to LEGO1/lego/scripts/act2/act2policestation.h diff --git a/LEGO1/legoact2.h b/LEGO1/lego/scripts/act2/legoact2.h similarity index 100% rename from LEGO1/legoact2.h rename to LEGO1/lego/scripts/act2/legoact2.h diff --git a/LEGO1/legoact2state.cpp b/LEGO1/lego/scripts/act2/legoact2state.cpp similarity index 100% rename from LEGO1/legoact2state.cpp rename to LEGO1/lego/scripts/act2/legoact2state.cpp diff --git a/LEGO1/legoact2state.h b/LEGO1/lego/scripts/act2/legoact2state.h similarity index 100% rename from LEGO1/legoact2state.h rename to LEGO1/lego/scripts/act2/legoact2state.h diff --git a/LEGO1/act3.cpp b/LEGO1/lego/scripts/act3/act3.cpp similarity index 100% rename from LEGO1/act3.cpp rename to LEGO1/lego/scripts/act3/act3.cpp diff --git a/LEGO1/act3.h b/LEGO1/lego/scripts/act3/act3.h similarity index 100% rename from LEGO1/act3.h rename to LEGO1/lego/scripts/act3/act3.h diff --git a/LEGO1/act3actor.h b/LEGO1/lego/scripts/act3/act3actor.h similarity index 100% rename from LEGO1/act3actor.h rename to LEGO1/lego/scripts/act3/act3actor.h diff --git a/LEGO1/act3shark.cpp b/LEGO1/lego/scripts/act3/act3shark.cpp similarity index 100% rename from LEGO1/act3shark.cpp rename to LEGO1/lego/scripts/act3/act3shark.cpp diff --git a/LEGO1/act3shark.h b/LEGO1/lego/scripts/act3/act3shark.h similarity index 100% rename from LEGO1/act3shark.h rename to LEGO1/lego/scripts/act3/act3shark.h diff --git a/LEGO1/act3state.cpp b/LEGO1/lego/scripts/act3/act3state.cpp similarity index 100% rename from LEGO1/act3state.cpp rename to LEGO1/lego/scripts/act3/act3state.cpp diff --git a/LEGO1/act3state.h b/LEGO1/lego/scripts/act3/act3state.h similarity index 100% rename from LEGO1/act3state.h rename to LEGO1/lego/scripts/act3/act3state.h diff --git a/LEGO1/gasstation.cpp b/LEGO1/lego/scripts/gasstation/gasstation.cpp similarity index 100% rename from LEGO1/gasstation.cpp rename to LEGO1/lego/scripts/gasstation/gasstation.cpp diff --git a/LEGO1/gasstation.h b/LEGO1/lego/scripts/gasstation/gasstation.h similarity index 100% rename from LEGO1/gasstation.h rename to LEGO1/lego/scripts/gasstation/gasstation.h diff --git a/LEGO1/gasstationentity.cpp b/LEGO1/lego/scripts/gasstation/gasstationentity.cpp similarity index 100% rename from LEGO1/gasstationentity.cpp rename to LEGO1/lego/scripts/gasstation/gasstationentity.cpp diff --git a/LEGO1/gasstationentity.h b/LEGO1/lego/scripts/gasstation/gasstationentity.h similarity index 100% rename from LEGO1/gasstationentity.h rename to LEGO1/lego/scripts/gasstation/gasstationentity.h diff --git a/LEGO1/gasstationstate.cpp b/LEGO1/lego/scripts/gasstation/gasstationstate.cpp similarity index 100% rename from LEGO1/gasstationstate.cpp rename to LEGO1/lego/scripts/gasstation/gasstationstate.cpp diff --git a/LEGO1/gasstationstate.h b/LEGO1/lego/scripts/gasstation/gasstationstate.h similarity index 100% rename from LEGO1/gasstationstate.h rename to LEGO1/lego/scripts/gasstation/gasstationstate.h diff --git a/LEGO1/ambulance.cpp b/LEGO1/lego/scripts/hospital/ambulance.cpp similarity index 100% rename from LEGO1/ambulance.cpp rename to LEGO1/lego/scripts/hospital/ambulance.cpp diff --git a/LEGO1/ambulance.h b/LEGO1/lego/scripts/hospital/ambulance.h similarity index 100% rename from LEGO1/ambulance.h rename to LEGO1/lego/scripts/hospital/ambulance.h diff --git a/LEGO1/ambulancemissionstate.cpp b/LEGO1/lego/scripts/hospital/ambulancemissionstate.cpp similarity index 100% rename from LEGO1/ambulancemissionstate.cpp rename to LEGO1/lego/scripts/hospital/ambulancemissionstate.cpp diff --git a/LEGO1/ambulancemissionstate.h b/LEGO1/lego/scripts/hospital/ambulancemissionstate.h similarity index 100% rename from LEGO1/ambulancemissionstate.h rename to LEGO1/lego/scripts/hospital/ambulancemissionstate.h diff --git a/LEGO1/hospital.cpp b/LEGO1/lego/scripts/hospital/hospital.cpp similarity index 100% rename from LEGO1/hospital.cpp rename to LEGO1/lego/scripts/hospital/hospital.cpp diff --git a/LEGO1/hospital.h b/LEGO1/lego/scripts/hospital/hospital.h similarity index 100% rename from LEGO1/hospital.h rename to LEGO1/lego/scripts/hospital/hospital.h diff --git a/LEGO1/hospitalentity.cpp b/LEGO1/lego/scripts/hospital/hospitalentity.cpp similarity index 100% rename from LEGO1/hospitalentity.cpp rename to LEGO1/lego/scripts/hospital/hospitalentity.cpp diff --git a/LEGO1/hospitalentity.h b/LEGO1/lego/scripts/hospital/hospitalentity.h similarity index 100% rename from LEGO1/hospitalentity.h rename to LEGO1/lego/scripts/hospital/hospitalentity.h diff --git a/LEGO1/hospitalstate.cpp b/LEGO1/lego/scripts/hospital/hospitalstate.cpp similarity index 100% rename from LEGO1/hospitalstate.cpp rename to LEGO1/lego/scripts/hospital/hospitalstate.cpp diff --git a/LEGO1/hospitalstate.h b/LEGO1/lego/scripts/hospital/hospitalstate.h similarity index 100% rename from LEGO1/hospitalstate.h rename to LEGO1/lego/scripts/hospital/hospitalstate.h diff --git a/LEGO1/elevatorbottom.cpp b/LEGO1/lego/scripts/infocenter/elevatorbottom.cpp similarity index 100% rename from LEGO1/elevatorbottom.cpp rename to LEGO1/lego/scripts/infocenter/elevatorbottom.cpp diff --git a/LEGO1/elevatorbottom.h b/LEGO1/lego/scripts/infocenter/elevatorbottom.h similarity index 100% rename from LEGO1/elevatorbottom.h rename to LEGO1/lego/scripts/infocenter/elevatorbottom.h diff --git a/LEGO1/infocenter.cpp b/LEGO1/lego/scripts/infocenter/infocenter.cpp similarity index 100% rename from LEGO1/infocenter.cpp rename to LEGO1/lego/scripts/infocenter/infocenter.cpp diff --git a/LEGO1/infocenter.h b/LEGO1/lego/scripts/infocenter/infocenter.h similarity index 100% rename from LEGO1/infocenter.h rename to LEGO1/lego/scripts/infocenter/infocenter.h diff --git a/LEGO1/infocenterdoor.cpp b/LEGO1/lego/scripts/infocenter/infocenterdoor.cpp similarity index 100% rename from LEGO1/infocenterdoor.cpp rename to LEGO1/lego/scripts/infocenter/infocenterdoor.cpp diff --git a/LEGO1/infocenterdoor.h b/LEGO1/lego/scripts/infocenter/infocenterdoor.h similarity index 100% rename from LEGO1/infocenterdoor.h rename to LEGO1/lego/scripts/infocenter/infocenterdoor.h diff --git a/LEGO1/infocenterentity.cpp b/LEGO1/lego/scripts/infocenter/infocenterentity.cpp similarity index 100% rename from LEGO1/infocenterentity.cpp rename to LEGO1/lego/scripts/infocenter/infocenterentity.cpp diff --git a/LEGO1/infocenterentity.h b/LEGO1/lego/scripts/infocenter/infocenterentity.h similarity index 100% rename from LEGO1/infocenterentity.h rename to LEGO1/lego/scripts/infocenter/infocenterentity.h diff --git a/LEGO1/infocenterstate.cpp b/LEGO1/lego/scripts/infocenter/infocenterstate.cpp similarity index 100% rename from LEGO1/infocenterstate.cpp rename to LEGO1/lego/scripts/infocenter/infocenterstate.cpp diff --git a/LEGO1/infocenterstate.h b/LEGO1/lego/scripts/infocenter/infocenterstate.h similarity index 100% rename from LEGO1/infocenterstate.h rename to LEGO1/lego/scripts/infocenter/infocenterstate.h diff --git a/LEGO1/registrationbook.cpp b/LEGO1/lego/scripts/infocenter/registrationbook.cpp similarity index 100% rename from LEGO1/registrationbook.cpp rename to LEGO1/lego/scripts/infocenter/registrationbook.cpp diff --git a/LEGO1/registrationbook.h b/LEGO1/lego/scripts/infocenter/registrationbook.h similarity index 100% rename from LEGO1/registrationbook.h rename to LEGO1/lego/scripts/infocenter/registrationbook.h diff --git a/LEGO1/score.cpp b/LEGO1/lego/scripts/infocenter/score.cpp similarity index 100% rename from LEGO1/score.cpp rename to LEGO1/lego/scripts/infocenter/score.cpp diff --git a/LEGO1/score.h b/LEGO1/lego/scripts/infocenter/score.h similarity index 100% rename from LEGO1/score.h rename to LEGO1/lego/scripts/infocenter/score.h diff --git a/LEGO1/scorestate.cpp b/LEGO1/lego/scripts/infocenter/scorestate.cpp similarity index 100% rename from LEGO1/scorestate.cpp rename to LEGO1/lego/scripts/infocenter/scorestate.cpp diff --git a/LEGO1/scorestate.h b/LEGO1/lego/scripts/infocenter/scorestate.h similarity index 100% rename from LEGO1/scorestate.h rename to LEGO1/lego/scripts/infocenter/scorestate.h diff --git a/LEGO1/animstate.cpp b/LEGO1/lego/scripts/isle/animstate.cpp similarity index 100% rename from LEGO1/animstate.cpp rename to LEGO1/lego/scripts/isle/animstate.cpp diff --git a/LEGO1/animstate.h b/LEGO1/lego/scripts/isle/animstate.h similarity index 100% rename from LEGO1/animstate.h rename to LEGO1/lego/scripts/isle/animstate.h diff --git a/LEGO1/beachhouseentity.cpp b/LEGO1/lego/scripts/isle/beachhouseentity.cpp similarity index 100% rename from LEGO1/beachhouseentity.cpp rename to LEGO1/lego/scripts/isle/beachhouseentity.cpp diff --git a/LEGO1/beachhouseentity.h b/LEGO1/lego/scripts/isle/beachhouseentity.h similarity index 100% rename from LEGO1/beachhouseentity.h rename to LEGO1/lego/scripts/isle/beachhouseentity.h diff --git a/LEGO1/bike.cpp b/LEGO1/lego/scripts/isle/bike.cpp similarity index 100% rename from LEGO1/bike.cpp rename to LEGO1/lego/scripts/isle/bike.cpp diff --git a/LEGO1/bike.h b/LEGO1/lego/scripts/isle/bike.h similarity index 100% rename from LEGO1/bike.h rename to LEGO1/lego/scripts/isle/bike.h diff --git a/LEGO1/bumpbouy.cpp b/LEGO1/lego/scripts/isle/bumpbouy.cpp similarity index 100% rename from LEGO1/bumpbouy.cpp rename to LEGO1/lego/scripts/isle/bumpbouy.cpp diff --git a/LEGO1/bumpbouy.h b/LEGO1/lego/scripts/isle/bumpbouy.h similarity index 100% rename from LEGO1/bumpbouy.h rename to LEGO1/lego/scripts/isle/bumpbouy.h diff --git a/LEGO1/doors.h b/LEGO1/lego/scripts/isle/doors.h similarity index 100% rename from LEGO1/doors.h rename to LEGO1/lego/scripts/isle/doors.h diff --git a/LEGO1/historybook.cpp b/LEGO1/lego/scripts/isle/historybook.cpp similarity index 100% rename from LEGO1/historybook.cpp rename to LEGO1/lego/scripts/isle/historybook.cpp diff --git a/LEGO1/historybook.h b/LEGO1/lego/scripts/isle/historybook.h similarity index 100% rename from LEGO1/historybook.h rename to LEGO1/lego/scripts/isle/historybook.h diff --git a/LEGO1/isle.cpp b/LEGO1/lego/scripts/isle/isle.cpp similarity index 100% rename from LEGO1/isle.cpp rename to LEGO1/lego/scripts/isle/isle.cpp diff --git a/LEGO1/isle.h b/LEGO1/lego/scripts/isle/isle.h similarity index 100% rename from LEGO1/isle.h rename to LEGO1/lego/scripts/isle/isle.h diff --git a/LEGO1/isleactor.cpp b/LEGO1/lego/scripts/isle/isleactor.cpp similarity index 100% rename from LEGO1/isleactor.cpp rename to LEGO1/lego/scripts/isle/isleactor.cpp diff --git a/LEGO1/isleactor.h b/LEGO1/lego/scripts/isle/isleactor.h similarity index 100% rename from LEGO1/isleactor.h rename to LEGO1/lego/scripts/isle/isleactor.h diff --git a/LEGO1/islepathactor.cpp b/LEGO1/lego/scripts/isle/islepathactor.cpp similarity index 100% rename from LEGO1/islepathactor.cpp rename to LEGO1/lego/scripts/isle/islepathactor.cpp diff --git a/LEGO1/islepathactor.h b/LEGO1/lego/scripts/isle/islepathactor.h similarity index 100% rename from LEGO1/islepathactor.h rename to LEGO1/lego/scripts/isle/islepathactor.h diff --git a/LEGO1/jukebox.cpp b/LEGO1/lego/scripts/isle/jukebox.cpp similarity index 100% rename from LEGO1/jukebox.cpp rename to LEGO1/lego/scripts/isle/jukebox.cpp diff --git a/LEGO1/jukebox.h b/LEGO1/lego/scripts/isle/jukebox.h similarity index 100% rename from LEGO1/jukebox.h rename to LEGO1/lego/scripts/isle/jukebox.h diff --git a/LEGO1/jukeboxentity.cpp b/LEGO1/lego/scripts/isle/jukeboxentity.cpp similarity index 100% rename from LEGO1/jukeboxentity.cpp rename to LEGO1/lego/scripts/isle/jukeboxentity.cpp diff --git a/LEGO1/jukeboxentity.h b/LEGO1/lego/scripts/isle/jukeboxentity.h similarity index 100% rename from LEGO1/jukeboxentity.h rename to LEGO1/lego/scripts/isle/jukeboxentity.h diff --git a/LEGO1/jukeboxstate.cpp b/LEGO1/lego/scripts/isle/jukeboxstate.cpp similarity index 100% rename from LEGO1/jukeboxstate.cpp rename to LEGO1/lego/scripts/isle/jukeboxstate.cpp diff --git a/LEGO1/jukeboxstate.h b/LEGO1/lego/scripts/isle/jukeboxstate.h similarity index 100% rename from LEGO1/jukeboxstate.h rename to LEGO1/lego/scripts/isle/jukeboxstate.h diff --git a/LEGO1/motorcycle.cpp b/LEGO1/lego/scripts/isle/motorcycle.cpp similarity index 100% rename from LEGO1/motorcycle.cpp rename to LEGO1/lego/scripts/isle/motorcycle.cpp diff --git a/LEGO1/motorcycle.h b/LEGO1/lego/scripts/isle/motorcycle.h similarity index 100% rename from LEGO1/motorcycle.h rename to LEGO1/lego/scripts/isle/motorcycle.h diff --git a/LEGO1/radio.cpp b/LEGO1/lego/scripts/isle/radio.cpp similarity index 100% rename from LEGO1/radio.cpp rename to LEGO1/lego/scripts/isle/radio.cpp diff --git a/LEGO1/radio.h b/LEGO1/lego/scripts/isle/radio.h similarity index 100% rename from LEGO1/radio.h rename to LEGO1/lego/scripts/isle/radio.h diff --git a/LEGO1/radiostate.cpp b/LEGO1/lego/scripts/isle/radiostate.cpp similarity index 100% rename from LEGO1/radiostate.cpp rename to LEGO1/lego/scripts/isle/radiostate.cpp diff --git a/LEGO1/radiostate.h b/LEGO1/lego/scripts/isle/radiostate.h similarity index 100% rename from LEGO1/radiostate.h rename to LEGO1/lego/scripts/isle/radiostate.h diff --git a/LEGO1/skateboard.cpp b/LEGO1/lego/scripts/isle/skateboard.cpp similarity index 100% rename from LEGO1/skateboard.cpp rename to LEGO1/lego/scripts/isle/skateboard.cpp diff --git a/LEGO1/skateboard.h b/LEGO1/lego/scripts/isle/skateboard.h similarity index 100% rename from LEGO1/skateboard.h rename to LEGO1/lego/scripts/isle/skateboard.h diff --git a/LEGO1/pizza.cpp b/LEGO1/lego/scripts/pizzeria/pizza.cpp similarity index 100% rename from LEGO1/pizza.cpp rename to LEGO1/lego/scripts/pizzeria/pizza.cpp diff --git a/LEGO1/pizza.h b/LEGO1/lego/scripts/pizzeria/pizza.h similarity index 100% rename from LEGO1/pizza.h rename to LEGO1/lego/scripts/pizzeria/pizza.h diff --git a/LEGO1/pizzamissionstate.cpp b/LEGO1/lego/scripts/pizzeria/pizzamissionstate.cpp similarity index 100% rename from LEGO1/pizzamissionstate.cpp rename to LEGO1/lego/scripts/pizzeria/pizzamissionstate.cpp diff --git a/LEGO1/pizzamissionstate.h b/LEGO1/lego/scripts/pizzeria/pizzamissionstate.h similarity index 100% rename from LEGO1/pizzamissionstate.h rename to LEGO1/lego/scripts/pizzeria/pizzamissionstate.h diff --git a/LEGO1/pizzeria.cpp b/LEGO1/lego/scripts/pizzeria/pizzeria.cpp similarity index 100% rename from LEGO1/pizzeria.cpp rename to LEGO1/lego/scripts/pizzeria/pizzeria.cpp diff --git a/LEGO1/pizzeria.h b/LEGO1/lego/scripts/pizzeria/pizzeria.h similarity index 100% rename from LEGO1/pizzeria.h rename to LEGO1/lego/scripts/pizzeria/pizzeria.h diff --git a/LEGO1/pizzeriastate.cpp b/LEGO1/lego/scripts/pizzeria/pizzeriastate.cpp similarity index 100% rename from LEGO1/pizzeriastate.cpp rename to LEGO1/lego/scripts/pizzeria/pizzeriastate.cpp diff --git a/LEGO1/pizzeriastate.h b/LEGO1/lego/scripts/pizzeria/pizzeriastate.h similarity index 100% rename from LEGO1/pizzeriastate.h rename to LEGO1/lego/scripts/pizzeria/pizzeriastate.h diff --git a/LEGO1/police.cpp b/LEGO1/lego/scripts/police/police.cpp similarity index 100% rename from LEGO1/police.cpp rename to LEGO1/lego/scripts/police/police.cpp diff --git a/LEGO1/police.h b/LEGO1/lego/scripts/police/police.h similarity index 100% rename from LEGO1/police.h rename to LEGO1/lego/scripts/police/police.h diff --git a/LEGO1/policeentity.cpp b/LEGO1/lego/scripts/police/policeentity.cpp similarity index 100% rename from LEGO1/policeentity.cpp rename to LEGO1/lego/scripts/police/policeentity.cpp diff --git a/LEGO1/policeentity.h b/LEGO1/lego/scripts/police/policeentity.h similarity index 100% rename from LEGO1/policeentity.h rename to LEGO1/lego/scripts/police/policeentity.h diff --git a/LEGO1/policestate.cpp b/LEGO1/lego/scripts/police/policestate.cpp similarity index 100% rename from LEGO1/policestate.cpp rename to LEGO1/lego/scripts/police/policestate.cpp diff --git a/LEGO1/policestate.h b/LEGO1/lego/scripts/police/policestate.h similarity index 100% rename from LEGO1/policestate.h rename to LEGO1/lego/scripts/police/policestate.h diff --git a/LEGO1/carrace.cpp b/LEGO1/lego/scripts/race/carrace.cpp similarity index 100% rename from LEGO1/carrace.cpp rename to LEGO1/lego/scripts/race/carrace.cpp diff --git a/LEGO1/carrace.h b/LEGO1/lego/scripts/race/carrace.h similarity index 100% rename from LEGO1/carrace.h rename to LEGO1/lego/scripts/race/carrace.h diff --git a/LEGO1/carracestate.h b/LEGO1/lego/scripts/race/carracestate.h similarity index 100% rename from LEGO1/carracestate.h rename to LEGO1/lego/scripts/race/carracestate.h diff --git a/LEGO1/jetskirace.cpp b/LEGO1/lego/scripts/race/jetskirace.cpp similarity index 100% rename from LEGO1/jetskirace.cpp rename to LEGO1/lego/scripts/race/jetskirace.cpp diff --git a/LEGO1/jetskirace.h b/LEGO1/lego/scripts/race/jetskirace.h similarity index 100% rename from LEGO1/jetskirace.h rename to LEGO1/lego/scripts/race/jetskirace.h diff --git a/LEGO1/jetskiracestate.h b/LEGO1/lego/scripts/race/jetskiracestate.h similarity index 100% rename from LEGO1/jetskiracestate.h rename to LEGO1/lego/scripts/race/jetskiracestate.h diff --git a/LEGO1/racestandsentity.cpp b/LEGO1/lego/scripts/race/racestandsentity.cpp similarity index 100% rename from LEGO1/racestandsentity.cpp rename to LEGO1/lego/scripts/race/racestandsentity.cpp diff --git a/LEGO1/racestandsentity.h b/LEGO1/lego/scripts/race/racestandsentity.h similarity index 100% rename from LEGO1/racestandsentity.h rename to LEGO1/lego/scripts/race/racestandsentity.h diff --git a/LEGO1/racestate.cpp b/LEGO1/lego/scripts/race/racestate.cpp similarity index 100% rename from LEGO1/racestate.cpp rename to LEGO1/lego/scripts/race/racestate.cpp diff --git a/LEGO1/racestate.h b/LEGO1/lego/scripts/race/racestate.h similarity index 100% rename from LEGO1/racestate.h rename to LEGO1/lego/scripts/race/racestate.h diff --git a/LEGO1/towtrack.cpp b/LEGO1/lego/scripts/towtrack/towtrack.cpp similarity index 100% rename from LEGO1/towtrack.cpp rename to LEGO1/lego/scripts/towtrack/towtrack.cpp diff --git a/LEGO1/towtrack.h b/LEGO1/lego/scripts/towtrack/towtrack.h similarity index 100% rename from LEGO1/towtrack.h rename to LEGO1/lego/scripts/towtrack/towtrack.h diff --git a/LEGO1/towtrackmissionstate.cpp b/LEGO1/lego/scripts/towtrack/towtrackmissionstate.cpp similarity index 100% rename from LEGO1/towtrackmissionstate.cpp rename to LEGO1/lego/scripts/towtrack/towtrackmissionstate.cpp diff --git a/LEGO1/towtrackmissionstate.h b/LEGO1/lego/scripts/towtrack/towtrackmissionstate.h similarity index 100% rename from LEGO1/towtrackmissionstate.h rename to LEGO1/lego/scripts/towtrack/towtrackmissionstate.h diff --git a/LEGO1/3dmanager/lego3dmanager.cpp b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp similarity index 100% rename from LEGO1/3dmanager/lego3dmanager.cpp rename to LEGO1/lego/sources/3dmanager/lego3dmanager.cpp diff --git a/LEGO1/3dmanager/lego3dmanager.h b/LEGO1/lego/sources/3dmanager/lego3dmanager.h similarity index 100% rename from LEGO1/3dmanager/lego3dmanager.h rename to LEGO1/lego/sources/3dmanager/lego3dmanager.h diff --git a/LEGO1/3dmanager/lego3dview.cpp b/LEGO1/lego/sources/3dmanager/lego3dview.cpp similarity index 100% rename from LEGO1/3dmanager/lego3dview.cpp rename to LEGO1/lego/sources/3dmanager/lego3dview.cpp diff --git a/LEGO1/3dmanager/lego3dview.h b/LEGO1/lego/sources/3dmanager/lego3dview.h similarity index 100% rename from LEGO1/3dmanager/lego3dview.h rename to LEGO1/lego/sources/3dmanager/lego3dview.h diff --git a/LEGO1/3dmanager/legoview1.cpp b/LEGO1/lego/sources/3dmanager/legoview1.cpp similarity index 100% rename from LEGO1/3dmanager/legoview1.cpp rename to LEGO1/lego/sources/3dmanager/legoview1.cpp diff --git a/LEGO1/3dmanager/legoview1.h b/LEGO1/lego/sources/3dmanager/legoview1.h similarity index 100% rename from LEGO1/3dmanager/legoview1.h rename to LEGO1/lego/sources/3dmanager/legoview1.h diff --git a/LEGO1/3dmanager/tglsurface.cpp b/LEGO1/lego/sources/3dmanager/tglsurface.cpp similarity index 100% rename from LEGO1/3dmanager/tglsurface.cpp rename to LEGO1/lego/sources/3dmanager/tglsurface.cpp diff --git a/LEGO1/3dmanager/tglsurface.h b/LEGO1/lego/sources/3dmanager/tglsurface.h similarity index 97% rename from LEGO1/3dmanager/tglsurface.h rename to LEGO1/lego/sources/3dmanager/tglsurface.h index 1e4abc09..2ea4cf12 100644 --- a/LEGO1/3dmanager/tglsurface.h +++ b/LEGO1/lego/sources/3dmanager/tglsurface.h @@ -1,8 +1,8 @@ #ifndef _TglSurface_h #define _TglSurface_h -#include "../mxdirectx/mxstopwatch.h" -#include "../tgl/tgl.h" +#include "mxdirectx/mxstopwatch.h" +#include "tgl/tgl.h" class Tgl::Renderer; class Tgl::Device; diff --git a/LEGO1/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp similarity index 100% rename from LEGO1/legoroi.cpp rename to LEGO1/lego/sources/roi/legoroi.cpp diff --git a/LEGO1/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h similarity index 100% rename from LEGO1/legoroi.h rename to LEGO1/lego/sources/roi/legoroi.h diff --git a/LEGO1/legobuildingmanager.cpp b/LEGO1/legobuildingmanager.cpp deleted file mode 100644 index 34652509..00000000 --- a/LEGO1/legobuildingmanager.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "legobuildingmanager.h" - -// GLOBAL: LEGO1 0x100f37cc -int g_buildingManagerConfig = 1; - -// FUNCTION: LEGO1 0x1002f8b0 -void LegoBuildingManager::configureLegoBuildingManager(MxS32 p_buildingManagerConfig) -{ - g_buildingManagerConfig = p_buildingManagerConfig; -} - -// FUNCTION: LEGO1 0x1002f8c0 -LegoBuildingManager::LegoBuildingManager() -{ - Init(); -} - -// STUB: LEGO1 0x1002f960 -LegoBuildingManager::~LegoBuildingManager() -{ - // TODO -} - -// STUB: LEGO1 0x1002f9d0 -void LegoBuildingManager::Init() -{ - // TODO -} diff --git a/LEGO1/legocarbuild.cpp b/LEGO1/legocarbuild.cpp deleted file mode 100644 index f75e4653..00000000 --- a/LEGO1/legocarbuild.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "legocarbuild.h" - -// STUB: LEGO1 0x100226d0 -LegoCarBuild::LegoCarBuild() -{ - // TODO -} - -// STUB: LEGO1 0x10022a80 -LegoCarBuild::~LegoCarBuild() -{ - // TODO -} - -// STUB: LEGO1 0x100238b0 -MxResult LegoCarBuild::Tickle() -{ - // TODO - - return 0; -} - -// STUB: LEGO1 0x10024050 -MxLong LegoCarBuild::Notify(MxParam& p_param) -{ - // TODO - - return 0; -} diff --git a/LEGO1/legovehiclebuildstate.cpp b/LEGO1/legovehiclebuildstate.cpp deleted file mode 100644 index b0dccde2..00000000 --- a/LEGO1/legovehiclebuildstate.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "legovehiclebuildstate.h" - -#include "decomp.h" - -DECOMP_SIZE_ASSERT(LegoVehicleBuildState, 0x50); // 1000acd7 -DECOMP_SIZE_ASSERT(LegoVehicleBuildState::UnkStruct, 0xc); - -// FUNCTION: LEGO1 0x10017c00 -LegoVehicleBuildState::UnkStruct::UnkStruct() -{ - m_unk0x04 = 0; - m_unk0x00 = 0; - m_unk0x06 = 0; - m_unk0x08 = 0; -} - -// FUNCTION: LEGO1 0x10025f30 -LegoVehicleBuildState::LegoVehicleBuildState(char* p_classType) -{ - this->m_className = p_classType; - this->m_unk0x4c = 0; - this->m_unk0x4d = 0; - this->m_unk0x4e = 0; - this->m_placedPartCount = 0; -} diff --git a/LEGO1/mxparam.cpp b/LEGO1/mxparam.cpp deleted file mode 100644 index 4faa1625..00000000 --- a/LEGO1/mxparam.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "mxparam.h" diff --git a/LEGO1/mxunknown100d7c88.cpp b/LEGO1/mxunknown100d7c88.cpp deleted file mode 100644 index 04ddbf4f..00000000 --- a/LEGO1/mxunknown100d7c88.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "mxunknown100d7c88.h" - -// FUNCTION: LEGO1 0x10044e50 -MxUnknown100d7c88::~MxUnknown100d7c88() -{ -} - -// FUNCTION: LEGO1 0x10044eb0 -MxU32 MxUnknown100d7c88::VTable0x00() -{ - return m_unk0x14; -} diff --git a/LEGO1/mxunknown100d9d00.h b/LEGO1/mxunknown100d9d00.h deleted file mode 100644 index d5dd456f..00000000 --- a/LEGO1/mxunknown100d9d00.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef MXUNKNOWN100D9D00_H -#define MXUNKNOWN100D9D00_H - -#include "decomp.h" -#include "mxlist.h" -#include "mxunknown100d7c88.h" - -// VTABLE: LEGO1 0x100d9cd0 -// class MxCollection - -// VTABLE: LEGO1 0x100d9ce8 -// class MxList - -// VTABLE: LEGO1 0x100d9d00 -// SIZE 0x18 -class MxUnknown100d9d00 : public MxList { -public: - MxUnknown100d9d00() { SetDestroy(Destroy); } - - // STUB: LEGO1 0x1007b210 - virtual MxS8 Compare(MxUnknown100d7c88* p_a, MxUnknown100d7c88* p_b) override { return -1; } // vtable+0x14 - - // FUNCTION: LEGO1 0x1007b2e0 - static void Destroy(MxUnknown100d7c88* p_element) { delete p_element; } -}; - -// TEMPLATE: LEGO1 0x1007b300 -// MxCollection::Compare - -// TEMPLATE: LEGO1 0x1007b360 -// MxCollection::Destroy - -// SYNTHETIC: LEGO1 0x1007b400 -// MxUnknown100d9d00::`scalar deleting destructor' - -// SYNTHETIC: LEGO1 0x1007b470 -// MxCollection::`scalar deleting destructor' - -// SYNTHETIC: LEGO1 0x1007b4e0 -// MxList::`scalar deleting destructor' - -#endif // MXUNKNOWN100D9D00_H diff --git a/LEGO1/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h similarity index 100% rename from LEGO1/mxactionnotificationparam.h rename to LEGO1/omni/include/mxactionnotificationparam.h diff --git a/LEGO1/mxatomid.h b/LEGO1/omni/include/mxatomid.h similarity index 100% rename from LEGO1/mxatomid.h rename to LEGO1/omni/include/mxatomid.h diff --git a/LEGO1/mxatomidcounter.h b/LEGO1/omni/include/mxatomidcounter.h similarity index 100% rename from LEGO1/mxatomidcounter.h rename to LEGO1/omni/include/mxatomidcounter.h diff --git a/LEGO1/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h similarity index 100% rename from LEGO1/mxaudiomanager.h rename to LEGO1/omni/include/mxaudiomanager.h diff --git a/LEGO1/mxaudiopresenter.h b/LEGO1/omni/include/mxaudiopresenter.h similarity index 100% rename from LEGO1/mxaudiopresenter.h rename to LEGO1/omni/include/mxaudiopresenter.h diff --git a/LEGO1/mxautolocker.h b/LEGO1/omni/include/mxautolocker.h similarity index 100% rename from LEGO1/mxautolocker.h rename to LEGO1/omni/include/mxautolocker.h diff --git a/LEGO1/mxbackgroundaudiomanager.h b/LEGO1/omni/include/mxbackgroundaudiomanager.h similarity index 100% rename from LEGO1/mxbackgroundaudiomanager.h rename to LEGO1/omni/include/mxbackgroundaudiomanager.h diff --git a/LEGO1/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h similarity index 100% rename from LEGO1/mxbitmap.h rename to LEGO1/omni/include/mxbitmap.h diff --git a/LEGO1/mxcollection.h b/LEGO1/omni/include/mxcollection.h similarity index 100% rename from LEGO1/mxcollection.h rename to LEGO1/omni/include/mxcollection.h diff --git a/LEGO1/mxcompositemediapresenter.h b/LEGO1/omni/include/mxcompositemediapresenter.h similarity index 100% rename from LEGO1/mxcompositemediapresenter.h rename to LEGO1/omni/include/mxcompositemediapresenter.h diff --git a/LEGO1/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h similarity index 100% rename from LEGO1/mxcompositepresenter.h rename to LEGO1/omni/include/mxcompositepresenter.h diff --git a/LEGO1/mxcontrolpresenter.h b/LEGO1/omni/include/mxcontrolpresenter.h similarity index 100% rename from LEGO1/mxcontrolpresenter.h rename to LEGO1/omni/include/mxcontrolpresenter.h diff --git a/LEGO1/mxcore.h b/LEGO1/omni/include/mxcore.h similarity index 100% rename from LEGO1/mxcore.h rename to LEGO1/omni/include/mxcore.h diff --git a/LEGO1/mxcriticalsection.h b/LEGO1/omni/include/mxcriticalsection.h similarity index 100% rename from LEGO1/mxcriticalsection.h rename to LEGO1/omni/include/mxcriticalsection.h diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/omni/include/mxdiskstreamcontroller.h similarity index 100% rename from LEGO1/mxdiskstreamcontroller.h rename to LEGO1/omni/include/mxdiskstreamcontroller.h diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/omni/include/mxdiskstreamprovider.h similarity index 100% rename from LEGO1/mxdiskstreamprovider.h rename to LEGO1/omni/include/mxdiskstreamprovider.h diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h similarity index 100% rename from LEGO1/mxdisplaysurface.h rename to LEGO1/omni/include/mxdisplaysurface.h diff --git a/LEGO1/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h similarity index 100% rename from LEGO1/mxdsaction.h rename to LEGO1/omni/include/mxdsaction.h diff --git a/LEGO1/mxdsactionlist.h b/LEGO1/omni/include/mxdsactionlist.h similarity index 100% rename from LEGO1/mxdsactionlist.h rename to LEGO1/omni/include/mxdsactionlist.h diff --git a/LEGO1/mxdsanim.h b/LEGO1/omni/include/mxdsanim.h similarity index 100% rename from LEGO1/mxdsanim.h rename to LEGO1/omni/include/mxdsanim.h diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/omni/include/mxdsbuffer.h similarity index 100% rename from LEGO1/mxdsbuffer.h rename to LEGO1/omni/include/mxdsbuffer.h diff --git a/LEGO1/mxdschunk.h b/LEGO1/omni/include/mxdschunk.h similarity index 100% rename from LEGO1/mxdschunk.h rename to LEGO1/omni/include/mxdschunk.h diff --git a/LEGO1/mxdsevent.h b/LEGO1/omni/include/mxdsevent.h similarity index 100% rename from LEGO1/mxdsevent.h rename to LEGO1/omni/include/mxdsevent.h diff --git a/LEGO1/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h similarity index 100% rename from LEGO1/mxdsfile.h rename to LEGO1/omni/include/mxdsfile.h diff --git a/LEGO1/mxdsmediaaction.h b/LEGO1/omni/include/mxdsmediaaction.h similarity index 100% rename from LEGO1/mxdsmediaaction.h rename to LEGO1/omni/include/mxdsmediaaction.h diff --git a/LEGO1/mxdsmultiaction.h b/LEGO1/omni/include/mxdsmultiaction.h similarity index 100% rename from LEGO1/mxdsmultiaction.h rename to LEGO1/omni/include/mxdsmultiaction.h diff --git a/LEGO1/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h similarity index 100% rename from LEGO1/mxdsobject.h rename to LEGO1/omni/include/mxdsobject.h diff --git a/LEGO1/mxdsobjectaction.h b/LEGO1/omni/include/mxdsobjectaction.h similarity index 100% rename from LEGO1/mxdsobjectaction.h rename to LEGO1/omni/include/mxdsobjectaction.h diff --git a/LEGO1/mxdsparallelaction.h b/LEGO1/omni/include/mxdsparallelaction.h similarity index 100% rename from LEGO1/mxdsparallelaction.h rename to LEGO1/omni/include/mxdsparallelaction.h diff --git a/LEGO1/mxdsselectaction.h b/LEGO1/omni/include/mxdsselectaction.h similarity index 100% rename from LEGO1/mxdsselectaction.h rename to LEGO1/omni/include/mxdsselectaction.h diff --git a/LEGO1/mxdsserialaction.h b/LEGO1/omni/include/mxdsserialaction.h similarity index 100% rename from LEGO1/mxdsserialaction.h rename to LEGO1/omni/include/mxdsserialaction.h diff --git a/LEGO1/mxdssound.h b/LEGO1/omni/include/mxdssound.h similarity index 100% rename from LEGO1/mxdssound.h rename to LEGO1/omni/include/mxdssound.h diff --git a/LEGO1/mxdssource.h b/LEGO1/omni/include/mxdssource.h similarity index 100% rename from LEGO1/mxdssource.h rename to LEGO1/omni/include/mxdssource.h diff --git a/LEGO1/mxdsstill.h b/LEGO1/omni/include/mxdsstill.h similarity index 100% rename from LEGO1/mxdsstill.h rename to LEGO1/omni/include/mxdsstill.h diff --git a/LEGO1/mxdsstreamingaction.h b/LEGO1/omni/include/mxdsstreamingaction.h similarity index 100% rename from LEGO1/mxdsstreamingaction.h rename to LEGO1/omni/include/mxdsstreamingaction.h diff --git a/LEGO1/mxdssubscriber.h b/LEGO1/omni/include/mxdssubscriber.h similarity index 100% rename from LEGO1/mxdssubscriber.h rename to LEGO1/omni/include/mxdssubscriber.h diff --git a/LEGO1/mxdstypes.h b/LEGO1/omni/include/mxdstypes.h old mode 100755 new mode 100644 similarity index 100% rename from LEGO1/mxdstypes.h rename to LEGO1/omni/include/mxdstypes.h diff --git a/LEGO1/mxentity.h b/LEGO1/omni/include/mxentity.h similarity index 100% rename from LEGO1/mxentity.h rename to LEGO1/omni/include/mxentity.h diff --git a/LEGO1/mxeventmanager.h b/LEGO1/omni/include/mxeventmanager.h similarity index 100% rename from LEGO1/mxeventmanager.h rename to LEGO1/omni/include/mxeventmanager.h diff --git a/LEGO1/mxeventpresenter.h b/LEGO1/omni/include/mxeventpresenter.h similarity index 100% rename from LEGO1/mxeventpresenter.h rename to LEGO1/omni/include/mxeventpresenter.h diff --git a/LEGO1/mxflcpresenter.h b/LEGO1/omni/include/mxflcpresenter.h similarity index 100% rename from LEGO1/mxflcpresenter.h rename to LEGO1/omni/include/mxflcpresenter.h diff --git a/LEGO1/mxhashtable.h b/LEGO1/omni/include/mxhashtable.h similarity index 100% rename from LEGO1/mxhashtable.h rename to LEGO1/omni/include/mxhashtable.h diff --git a/LEGO1/mxioinfo.h b/LEGO1/omni/include/mxioinfo.h similarity index 100% rename from LEGO1/mxioinfo.h rename to LEGO1/omni/include/mxioinfo.h diff --git a/LEGO1/mxlist.h b/LEGO1/omni/include/mxlist.h similarity index 100% rename from LEGO1/mxlist.h rename to LEGO1/omni/include/mxlist.h diff --git a/LEGO1/mxloopingflcpresenter.h b/LEGO1/omni/include/mxloopingflcpresenter.h similarity index 100% rename from LEGO1/mxloopingflcpresenter.h rename to LEGO1/omni/include/mxloopingflcpresenter.h diff --git a/LEGO1/mxloopingmidipresenter.h b/LEGO1/omni/include/mxloopingmidipresenter.h similarity index 100% rename from LEGO1/mxloopingmidipresenter.h rename to LEGO1/omni/include/mxloopingmidipresenter.h diff --git a/LEGO1/mxloopingsmkpresenter.h b/LEGO1/omni/include/mxloopingsmkpresenter.h similarity index 100% rename from LEGO1/mxloopingsmkpresenter.h rename to LEGO1/omni/include/mxloopingsmkpresenter.h diff --git a/LEGO1/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h similarity index 100% rename from LEGO1/mxmediamanager.h rename to LEGO1/omni/include/mxmediamanager.h diff --git a/LEGO1/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h similarity index 100% rename from LEGO1/mxmediapresenter.h rename to LEGO1/omni/include/mxmediapresenter.h diff --git a/LEGO1/mxmidipresenter.h b/LEGO1/omni/include/mxmidipresenter.h similarity index 100% rename from LEGO1/mxmidipresenter.h rename to LEGO1/omni/include/mxmidipresenter.h diff --git a/LEGO1/mxmusicmanager.h b/LEGO1/omni/include/mxmusicmanager.h similarity index 100% rename from LEGO1/mxmusicmanager.h rename to LEGO1/omni/include/mxmusicmanager.h diff --git a/LEGO1/mxmusicpresenter.h b/LEGO1/omni/include/mxmusicpresenter.h similarity index 100% rename from LEGO1/mxmusicpresenter.h rename to LEGO1/omni/include/mxmusicpresenter.h diff --git a/LEGO1/mxnextactiondatastart.h b/LEGO1/omni/include/mxnextactiondatastart.h similarity index 100% rename from LEGO1/mxnextactiondatastart.h rename to LEGO1/omni/include/mxnextactiondatastart.h diff --git a/LEGO1/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h similarity index 100% rename from LEGO1/mxnotificationmanager.h rename to LEGO1/omni/include/mxnotificationmanager.h diff --git a/LEGO1/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h similarity index 100% rename from LEGO1/mxnotificationparam.h rename to LEGO1/omni/include/mxnotificationparam.h diff --git a/LEGO1/mxobjectfactory.h b/LEGO1/omni/include/mxobjectfactory.h similarity index 100% rename from LEGO1/mxobjectfactory.h rename to LEGO1/omni/include/mxobjectfactory.h diff --git a/LEGO1/mxomni.h b/LEGO1/omni/include/mxomni.h similarity index 100% rename from LEGO1/mxomni.h rename to LEGO1/omni/include/mxomni.h diff --git a/LEGO1/mxomnicreateflags.h b/LEGO1/omni/include/mxomnicreateflags.h similarity index 100% rename from LEGO1/mxomnicreateflags.h rename to LEGO1/omni/include/mxomnicreateflags.h diff --git a/LEGO1/mxomnicreateparam.h b/LEGO1/omni/include/mxomnicreateparam.h similarity index 100% rename from LEGO1/mxomnicreateparam.h rename to LEGO1/omni/include/mxomnicreateparam.h diff --git a/LEGO1/mxpalette.h b/LEGO1/omni/include/mxpalette.h similarity index 100% rename from LEGO1/mxpalette.h rename to LEGO1/omni/include/mxpalette.h diff --git a/LEGO1/mxparam.h b/LEGO1/omni/include/mxparam.h similarity index 100% rename from LEGO1/mxparam.h rename to LEGO1/omni/include/mxparam.h diff --git a/LEGO1/mxpoint32.h b/LEGO1/omni/include/mxpoint32.h old mode 100755 new mode 100644 similarity index 100% rename from LEGO1/mxpoint32.h rename to LEGO1/omni/include/mxpoint32.h diff --git a/LEGO1/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h similarity index 100% rename from LEGO1/mxpresenter.h rename to LEGO1/omni/include/mxpresenter.h diff --git a/LEGO1/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h similarity index 100% rename from LEGO1/mxpresenterlist.h rename to LEGO1/omni/include/mxpresenterlist.h diff --git a/LEGO1/mxqueue.h b/LEGO1/omni/include/mxqueue.h similarity index 100% rename from LEGO1/mxqueue.h rename to LEGO1/omni/include/mxqueue.h diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/omni/include/mxramstreamcontroller.h similarity index 100% rename from LEGO1/mxramstreamcontroller.h rename to LEGO1/omni/include/mxramstreamcontroller.h diff --git a/LEGO1/mxramstreamprovider.h b/LEGO1/omni/include/mxramstreamprovider.h similarity index 100% rename from LEGO1/mxramstreamprovider.h rename to LEGO1/omni/include/mxramstreamprovider.h diff --git a/LEGO1/mxrect32.h b/LEGO1/omni/include/mxrect32.h similarity index 100% rename from LEGO1/mxrect32.h rename to LEGO1/omni/include/mxrect32.h diff --git a/LEGO1/mxrectlist.h b/LEGO1/omni/include/mxrectlist.h similarity index 100% rename from LEGO1/mxrectlist.h rename to LEGO1/omni/include/mxrectlist.h diff --git a/LEGO1/mxregion.h b/LEGO1/omni/include/mxregion.h similarity index 100% rename from LEGO1/mxregion.h rename to LEGO1/omni/include/mxregion.h diff --git a/LEGO1/mxregioncursor.h b/LEGO1/omni/include/mxregioncursor.h similarity index 100% rename from LEGO1/mxregioncursor.h rename to LEGO1/omni/include/mxregioncursor.h diff --git a/LEGO1/mxregionlist.h b/LEGO1/omni/include/mxregionlist.h similarity index 100% rename from LEGO1/mxregionlist.h rename to LEGO1/omni/include/mxregionlist.h diff --git a/LEGO1/mxscheduler.h b/LEGO1/omni/include/mxscheduler.h similarity index 100% rename from LEGO1/mxscheduler.h rename to LEGO1/omni/include/mxscheduler.h diff --git a/LEGO1/mxsemaphore.h b/LEGO1/omni/include/mxsemaphore.h similarity index 100% rename from LEGO1/mxsemaphore.h rename to LEGO1/omni/include/mxsemaphore.h diff --git a/LEGO1/mxsize32.h b/LEGO1/omni/include/mxsize32.h similarity index 100% rename from LEGO1/mxsize32.h rename to LEGO1/omni/include/mxsize32.h diff --git a/LEGO1/mxsmack.h b/LEGO1/omni/include/mxsmack.h similarity index 100% rename from LEGO1/mxsmack.h rename to LEGO1/omni/include/mxsmack.h diff --git a/LEGO1/mxsmkpresenter.h b/LEGO1/omni/include/mxsmkpresenter.h similarity index 100% rename from LEGO1/mxsmkpresenter.h rename to LEGO1/omni/include/mxsmkpresenter.h diff --git a/LEGO1/mxsoundmanager.h b/LEGO1/omni/include/mxsoundmanager.h similarity index 100% rename from LEGO1/mxsoundmanager.h rename to LEGO1/omni/include/mxsoundmanager.h diff --git a/LEGO1/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h similarity index 100% rename from LEGO1/mxsoundpresenter.h rename to LEGO1/omni/include/mxsoundpresenter.h diff --git a/LEGO1/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h similarity index 100% rename from LEGO1/mxstillpresenter.h rename to LEGO1/omni/include/mxstillpresenter.h diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/omni/include/mxstreamchunk.h similarity index 100% rename from LEGO1/mxstreamchunk.h rename to LEGO1/omni/include/mxstreamchunk.h diff --git a/LEGO1/mxstreamchunklist.h b/LEGO1/omni/include/mxstreamchunklist.h similarity index 100% rename from LEGO1/mxstreamchunklist.h rename to LEGO1/omni/include/mxstreamchunklist.h diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h similarity index 100% rename from LEGO1/mxstreamcontroller.h rename to LEGO1/omni/include/mxstreamcontroller.h diff --git a/LEGO1/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h similarity index 100% rename from LEGO1/mxstreamer.h rename to LEGO1/omni/include/mxstreamer.h diff --git a/LEGO1/mxstreamlist.h b/LEGO1/omni/include/mxstreamlist.h similarity index 100% rename from LEGO1/mxstreamlist.h rename to LEGO1/omni/include/mxstreamlist.h diff --git a/LEGO1/mxstreamprovider.h b/LEGO1/omni/include/mxstreamprovider.h similarity index 100% rename from LEGO1/mxstreamprovider.h rename to LEGO1/omni/include/mxstreamprovider.h diff --git a/LEGO1/mxstring.h b/LEGO1/omni/include/mxstring.h similarity index 100% rename from LEGO1/mxstring.h rename to LEGO1/omni/include/mxstring.h diff --git a/LEGO1/mxstringlist.h b/LEGO1/omni/include/mxstringlist.h similarity index 100% rename from LEGO1/mxstringlist.h rename to LEGO1/omni/include/mxstringlist.h diff --git a/LEGO1/mxthread.h b/LEGO1/omni/include/mxthread.h similarity index 100% rename from LEGO1/mxthread.h rename to LEGO1/omni/include/mxthread.h diff --git a/LEGO1/mxticklemanager.h b/LEGO1/omni/include/mxticklemanager.h similarity index 100% rename from LEGO1/mxticklemanager.h rename to LEGO1/omni/include/mxticklemanager.h diff --git a/LEGO1/mxtimer.h b/LEGO1/omni/include/mxtimer.h similarity index 100% rename from LEGO1/mxtimer.h rename to LEGO1/omni/include/mxtimer.h diff --git a/LEGO1/mxtransitionmanager.h b/LEGO1/omni/include/mxtransitionmanager.h similarity index 100% rename from LEGO1/mxtransitionmanager.h rename to LEGO1/omni/include/mxtransitionmanager.h diff --git a/LEGO1/mxtype17notificationparam.h b/LEGO1/omni/include/mxtype17notificationparam.h similarity index 100% rename from LEGO1/mxtype17notificationparam.h rename to LEGO1/omni/include/mxtype17notificationparam.h diff --git a/LEGO1/mxtype18notificationparam.h b/LEGO1/omni/include/mxtype18notificationparam.h similarity index 100% rename from LEGO1/mxtype18notificationparam.h rename to LEGO1/omni/include/mxtype18notificationparam.h diff --git a/LEGO1/mxtype19notificationparam.h b/LEGO1/omni/include/mxtype19notificationparam.h similarity index 100% rename from LEGO1/mxtype19notificationparam.h rename to LEGO1/omni/include/mxtype19notificationparam.h diff --git a/LEGO1/mxtypes.h b/LEGO1/omni/include/mxtypes.h similarity index 100% rename from LEGO1/mxtypes.h rename to LEGO1/omni/include/mxtypes.h diff --git a/LEGO1/mxvariable.h b/LEGO1/omni/include/mxvariable.h similarity index 100% rename from LEGO1/mxvariable.h rename to LEGO1/omni/include/mxvariable.h diff --git a/LEGO1/mxvariabletable.h b/LEGO1/omni/include/mxvariabletable.h similarity index 100% rename from LEGO1/mxvariabletable.h rename to LEGO1/omni/include/mxvariabletable.h diff --git a/LEGO1/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h similarity index 100% rename from LEGO1/mxvideomanager.h rename to LEGO1/omni/include/mxvideomanager.h diff --git a/LEGO1/mxvideoparam.h b/LEGO1/omni/include/mxvideoparam.h similarity index 100% rename from LEGO1/mxvideoparam.h rename to LEGO1/omni/include/mxvideoparam.h diff --git a/LEGO1/mxvideoparamflags.h b/LEGO1/omni/include/mxvideoparamflags.h similarity index 100% rename from LEGO1/mxvideoparamflags.h rename to LEGO1/omni/include/mxvideoparamflags.h diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h similarity index 100% rename from LEGO1/mxvideopresenter.h rename to LEGO1/omni/include/mxvideopresenter.h diff --git a/LEGO1/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h similarity index 100% rename from LEGO1/mxwavepresenter.h rename to LEGO1/omni/include/mxwavepresenter.h diff --git a/LEGO1/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp similarity index 100% rename from LEGO1/mxdsaction.cpp rename to LEGO1/omni/src/action/mxdsaction.cpp diff --git a/LEGO1/mxdsanim.cpp b/LEGO1/omni/src/action/mxdsanim.cpp similarity index 100% rename from LEGO1/mxdsanim.cpp rename to LEGO1/omni/src/action/mxdsanim.cpp diff --git a/LEGO1/mxdsevent.cpp b/LEGO1/omni/src/action/mxdsevent.cpp similarity index 100% rename from LEGO1/mxdsevent.cpp rename to LEGO1/omni/src/action/mxdsevent.cpp diff --git a/LEGO1/mxdsmediaaction.cpp b/LEGO1/omni/src/action/mxdsmediaaction.cpp similarity index 100% rename from LEGO1/mxdsmediaaction.cpp rename to LEGO1/omni/src/action/mxdsmediaaction.cpp diff --git a/LEGO1/mxdsmultiaction.cpp b/LEGO1/omni/src/action/mxdsmultiaction.cpp similarity index 100% rename from LEGO1/mxdsmultiaction.cpp rename to LEGO1/omni/src/action/mxdsmultiaction.cpp diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/omni/src/action/mxdsobject.cpp similarity index 100% rename from LEGO1/mxdsobject.cpp rename to LEGO1/omni/src/action/mxdsobject.cpp diff --git a/LEGO1/mxdsobjectaction.cpp b/LEGO1/omni/src/action/mxdsobjectaction.cpp similarity index 100% rename from LEGO1/mxdsobjectaction.cpp rename to LEGO1/omni/src/action/mxdsobjectaction.cpp diff --git a/LEGO1/mxdsparallelaction.cpp b/LEGO1/omni/src/action/mxdsparallelaction.cpp similarity index 100% rename from LEGO1/mxdsparallelaction.cpp rename to LEGO1/omni/src/action/mxdsparallelaction.cpp diff --git a/LEGO1/mxdsselectaction.cpp b/LEGO1/omni/src/action/mxdsselectaction.cpp similarity index 100% rename from LEGO1/mxdsselectaction.cpp rename to LEGO1/omni/src/action/mxdsselectaction.cpp diff --git a/LEGO1/mxdsserialaction.cpp b/LEGO1/omni/src/action/mxdsserialaction.cpp similarity index 100% rename from LEGO1/mxdsserialaction.cpp rename to LEGO1/omni/src/action/mxdsserialaction.cpp diff --git a/LEGO1/mxdssound.cpp b/LEGO1/omni/src/action/mxdssound.cpp similarity index 100% rename from LEGO1/mxdssound.cpp rename to LEGO1/omni/src/action/mxdssound.cpp diff --git a/LEGO1/mxdsstill.cpp b/LEGO1/omni/src/action/mxdsstill.cpp similarity index 100% rename from LEGO1/mxdsstill.cpp rename to LEGO1/omni/src/action/mxdsstill.cpp diff --git a/LEGO1/mxdsstreamingaction.cpp b/LEGO1/omni/src/action/mxdsstreamingaction.cpp similarity index 100% rename from LEGO1/mxdsstreamingaction.cpp rename to LEGO1/omni/src/action/mxdsstreamingaction.cpp diff --git a/LEGO1/mxaudiomanager.cpp b/LEGO1/omni/src/audio/mxaudiomanager.cpp similarity index 100% rename from LEGO1/mxaudiomanager.cpp rename to LEGO1/omni/src/audio/mxaudiomanager.cpp diff --git a/LEGO1/mxaudiopresenter.cpp b/LEGO1/omni/src/audio/mxaudiopresenter.cpp similarity index 100% rename from LEGO1/mxaudiopresenter.cpp rename to LEGO1/omni/src/audio/mxaudiopresenter.cpp diff --git a/LEGO1/mxbackgroundaudiomanager.cpp b/LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp similarity index 100% rename from LEGO1/mxbackgroundaudiomanager.cpp rename to LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp diff --git a/LEGO1/mxloopingmidipresenter.cpp b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp similarity index 100% rename from LEGO1/mxloopingmidipresenter.cpp rename to LEGO1/omni/src/audio/mxloopingmidipresenter.cpp diff --git a/LEGO1/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp similarity index 100% rename from LEGO1/mxmidipresenter.cpp rename to LEGO1/omni/src/audio/mxmidipresenter.cpp diff --git a/LEGO1/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp similarity index 100% rename from LEGO1/mxmusicmanager.cpp rename to LEGO1/omni/src/audio/mxmusicmanager.cpp diff --git a/LEGO1/mxmusicpresenter.cpp b/LEGO1/omni/src/audio/mxmusicpresenter.cpp similarity index 100% rename from LEGO1/mxmusicpresenter.cpp rename to LEGO1/omni/src/audio/mxmusicpresenter.cpp diff --git a/LEGO1/mxsoundmanager.cpp b/LEGO1/omni/src/audio/mxsoundmanager.cpp similarity index 100% rename from LEGO1/mxsoundmanager.cpp rename to LEGO1/omni/src/audio/mxsoundmanager.cpp diff --git a/LEGO1/mxsoundpresenter.cpp b/LEGO1/omni/src/audio/mxsoundpresenter.cpp similarity index 100% rename from LEGO1/mxsoundpresenter.cpp rename to LEGO1/omni/src/audio/mxsoundpresenter.cpp diff --git a/LEGO1/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp similarity index 100% rename from LEGO1/mxwavepresenter.cpp rename to LEGO1/omni/src/audio/mxwavepresenter.cpp diff --git a/LEGO1/mxatomid.cpp b/LEGO1/omni/src/common/mxatomid.cpp similarity index 100% rename from LEGO1/mxatomid.cpp rename to LEGO1/omni/src/common/mxatomid.cpp diff --git a/LEGO1/mxatomidcounter.cpp b/LEGO1/omni/src/common/mxatomidcounter.cpp similarity index 100% rename from LEGO1/mxatomidcounter.cpp rename to LEGO1/omni/src/common/mxatomidcounter.cpp diff --git a/LEGO1/mxcompositemediapresenter.cpp b/LEGO1/omni/src/common/mxcompositemediapresenter.cpp similarity index 100% rename from LEGO1/mxcompositemediapresenter.cpp rename to LEGO1/omni/src/common/mxcompositemediapresenter.cpp diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/omni/src/common/mxcompositepresenter.cpp similarity index 100% rename from LEGO1/mxcompositepresenter.cpp rename to LEGO1/omni/src/common/mxcompositepresenter.cpp diff --git a/LEGO1/mxcore.cpp b/LEGO1/omni/src/common/mxcore.cpp similarity index 100% rename from LEGO1/mxcore.cpp rename to LEGO1/omni/src/common/mxcore.cpp diff --git a/LEGO1/mxmediamanager.cpp b/LEGO1/omni/src/common/mxmediamanager.cpp similarity index 100% rename from LEGO1/mxmediamanager.cpp rename to LEGO1/omni/src/common/mxmediamanager.cpp diff --git a/LEGO1/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp similarity index 100% rename from LEGO1/mxmediapresenter.cpp rename to LEGO1/omni/src/common/mxmediapresenter.cpp diff --git a/LEGO1/mxobjectfactory.cpp b/LEGO1/omni/src/common/mxobjectfactory.cpp similarity index 100% rename from LEGO1/mxobjectfactory.cpp rename to LEGO1/omni/src/common/mxobjectfactory.cpp diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp similarity index 100% rename from LEGO1/mxpresenter.cpp rename to LEGO1/omni/src/common/mxpresenter.cpp diff --git a/LEGO1/mxstring.cpp b/LEGO1/omni/src/common/mxstring.cpp similarity index 100% rename from LEGO1/mxstring.cpp rename to LEGO1/omni/src/common/mxstring.cpp diff --git a/LEGO1/mxticklemanager.cpp b/LEGO1/omni/src/common/mxticklemanager.cpp similarity index 100% rename from LEGO1/mxticklemanager.cpp rename to LEGO1/omni/src/common/mxticklemanager.cpp diff --git a/LEGO1/mxtimer.cpp b/LEGO1/omni/src/common/mxtimer.cpp similarity index 100% rename from LEGO1/mxtimer.cpp rename to LEGO1/omni/src/common/mxtimer.cpp diff --git a/LEGO1/mxvariable.cpp b/LEGO1/omni/src/common/mxvariable.cpp similarity index 100% rename from LEGO1/mxvariable.cpp rename to LEGO1/omni/src/common/mxvariable.cpp diff --git a/LEGO1/mxvariabletable.cpp b/LEGO1/omni/src/common/mxvariabletable.cpp similarity index 100% rename from LEGO1/mxvariabletable.cpp rename to LEGO1/omni/src/common/mxvariabletable.cpp diff --git a/LEGO1/mxcontrolpresenter.cpp b/LEGO1/omni/src/control/mxcontrolpresenter.cpp similarity index 100% rename from LEGO1/mxcontrolpresenter.cpp rename to LEGO1/omni/src/control/mxcontrolpresenter.cpp diff --git a/LEGO1/mxentity.cpp b/LEGO1/omni/src/entity/mxentity.cpp similarity index 100% rename from LEGO1/mxentity.cpp rename to LEGO1/omni/src/entity/mxentity.cpp diff --git a/LEGO1/mxflcpresenter.cpp b/LEGO1/omni/src/entity/mxflcpresenter.cpp similarity index 100% rename from LEGO1/mxflcpresenter.cpp rename to LEGO1/omni/src/entity/mxflcpresenter.cpp diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/omni/src/entity/mxloopingflcpresenter.cpp similarity index 100% rename from LEGO1/mxloopingflcpresenter.cpp rename to LEGO1/omni/src/entity/mxloopingflcpresenter.cpp diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/entity/mxloopingsmkpresenter.cpp similarity index 100% rename from LEGO1/mxloopingsmkpresenter.cpp rename to LEGO1/omni/src/entity/mxloopingsmkpresenter.cpp diff --git a/LEGO1/mxsmkpresenter.cpp b/LEGO1/omni/src/entity/mxsmkpresenter.cpp similarity index 100% rename from LEGO1/mxsmkpresenter.cpp rename to LEGO1/omni/src/entity/mxsmkpresenter.cpp diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/omni/src/entity/mxvideomanager.cpp similarity index 100% rename from LEGO1/mxvideomanager.cpp rename to LEGO1/omni/src/entity/mxvideomanager.cpp diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/omni/src/entity/mxvideopresenter.cpp similarity index 100% rename from LEGO1/mxvideopresenter.cpp rename to LEGO1/omni/src/entity/mxvideopresenter.cpp diff --git a/LEGO1/mxeventmanager.cpp b/LEGO1/omni/src/event/mxeventmanager.cpp similarity index 100% rename from LEGO1/mxeventmanager.cpp rename to LEGO1/omni/src/event/mxeventmanager.cpp diff --git a/LEGO1/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp similarity index 100% rename from LEGO1/mxeventpresenter.cpp rename to LEGO1/omni/src/event/mxeventpresenter.cpp diff --git a/LEGO1/dllmain.cpp b/LEGO1/omni/src/main/mxmain.cpp similarity index 100% rename from LEGO1/dllmain.cpp rename to LEGO1/omni/src/main/mxmain.cpp diff --git a/LEGO1/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp similarity index 100% rename from LEGO1/mxomni.cpp rename to LEGO1/omni/src/main/mxomni.cpp diff --git a/LEGO1/mxomnicreateflags.cpp b/LEGO1/omni/src/main/mxomnicreateflags.cpp similarity index 100% rename from LEGO1/mxomnicreateflags.cpp rename to LEGO1/omni/src/main/mxomnicreateflags.cpp diff --git a/LEGO1/mxomnicreateparam.cpp b/LEGO1/omni/src/main/mxomnicreateparam.cpp similarity index 100% rename from LEGO1/mxomnicreateparam.cpp rename to LEGO1/omni/src/main/mxomnicreateparam.cpp diff --git a/LEGO1/mxactionnotificationparam.cpp b/LEGO1/omni/src/notify/mxactionnotificationparam.cpp similarity index 100% rename from LEGO1/mxactionnotificationparam.cpp rename to LEGO1/omni/src/notify/mxactionnotificationparam.cpp diff --git a/LEGO1/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp similarity index 100% rename from LEGO1/mxnotificationmanager.cpp rename to LEGO1/omni/src/notify/mxnotificationmanager.cpp diff --git a/LEGO1/mxnotificationparam.cpp b/LEGO1/omni/src/notify/mxnotificationparam.cpp similarity index 100% rename from LEGO1/mxnotificationparam.cpp rename to LEGO1/omni/src/notify/mxnotificationparam.cpp diff --git a/LEGO1/mxtype17notificationparam.cpp b/LEGO1/omni/src/notify/mxtype17notificationparam.cpp similarity index 100% rename from LEGO1/mxtype17notificationparam.cpp rename to LEGO1/omni/src/notify/mxtype17notificationparam.cpp diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp similarity index 100% rename from LEGO1/mxdiskstreamcontroller.cpp rename to LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp similarity index 100% rename from LEGO1/mxdiskstreamprovider.cpp rename to LEGO1/omni/src/stream/mxdiskstreamprovider.cpp diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp similarity index 100% rename from LEGO1/mxdsbuffer.cpp rename to LEGO1/omni/src/stream/mxdsbuffer.cpp diff --git a/LEGO1/mxdschunk.cpp b/LEGO1/omni/src/stream/mxdschunk.cpp similarity index 100% rename from LEGO1/mxdschunk.cpp rename to LEGO1/omni/src/stream/mxdschunk.cpp diff --git a/LEGO1/mxdsfile.cpp b/LEGO1/omni/src/stream/mxdsfile.cpp similarity index 100% rename from LEGO1/mxdsfile.cpp rename to LEGO1/omni/src/stream/mxdsfile.cpp diff --git a/LEGO1/mxdssource.cpp b/LEGO1/omni/src/stream/mxdssource.cpp similarity index 100% rename from LEGO1/mxdssource.cpp rename to LEGO1/omni/src/stream/mxdssource.cpp diff --git a/LEGO1/mxdssubscriber.cpp b/LEGO1/omni/src/stream/mxdssubscriber.cpp similarity index 100% rename from LEGO1/mxdssubscriber.cpp rename to LEGO1/omni/src/stream/mxdssubscriber.cpp diff --git a/LEGO1/mxioinfo.cpp b/LEGO1/omni/src/stream/mxioinfo.cpp similarity index 100% rename from LEGO1/mxioinfo.cpp rename to LEGO1/omni/src/stream/mxioinfo.cpp diff --git a/LEGO1/mxramstreamcontroller.cpp b/LEGO1/omni/src/stream/mxramstreamcontroller.cpp similarity index 100% rename from LEGO1/mxramstreamcontroller.cpp rename to LEGO1/omni/src/stream/mxramstreamcontroller.cpp diff --git a/LEGO1/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp similarity index 100% rename from LEGO1/mxramstreamprovider.cpp rename to LEGO1/omni/src/stream/mxramstreamprovider.cpp diff --git a/LEGO1/mxstreamchunk.cpp b/LEGO1/omni/src/stream/mxstreamchunk.cpp similarity index 100% rename from LEGO1/mxstreamchunk.cpp rename to LEGO1/omni/src/stream/mxstreamchunk.cpp diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp similarity index 100% rename from LEGO1/mxstreamcontroller.cpp rename to LEGO1/omni/src/stream/mxstreamcontroller.cpp diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp similarity index 100% rename from LEGO1/mxstreamer.cpp rename to LEGO1/omni/src/stream/mxstreamer.cpp diff --git a/LEGO1/mxstreamlist.cpp b/LEGO1/omni/src/stream/mxstreamlist.cpp similarity index 100% rename from LEGO1/mxstreamlist.cpp rename to LEGO1/omni/src/stream/mxstreamlist.cpp diff --git a/LEGO1/mxstreamprovider.cpp b/LEGO1/omni/src/stream/mxstreamprovider.cpp similarity index 100% rename from LEGO1/mxstreamprovider.cpp rename to LEGO1/omni/src/stream/mxstreamprovider.cpp diff --git a/LEGO1/mxautolocker.cpp b/LEGO1/omni/src/system/mxautolocker.cpp similarity index 100% rename from LEGO1/mxautolocker.cpp rename to LEGO1/omni/src/system/mxautolocker.cpp diff --git a/LEGO1/mxcriticalsection.cpp b/LEGO1/omni/src/system/mxcriticalsection.cpp similarity index 100% rename from LEGO1/mxcriticalsection.cpp rename to LEGO1/omni/src/system/mxcriticalsection.cpp diff --git a/LEGO1/mxscheduler.cpp b/LEGO1/omni/src/system/mxscheduler.cpp similarity index 100% rename from LEGO1/mxscheduler.cpp rename to LEGO1/omni/src/system/mxscheduler.cpp diff --git a/LEGO1/mxsemaphore.cpp b/LEGO1/omni/src/system/mxsemaphore.cpp similarity index 100% rename from LEGO1/mxsemaphore.cpp rename to LEGO1/omni/src/system/mxsemaphore.cpp diff --git a/LEGO1/mxthread.cpp b/LEGO1/omni/src/system/mxthread.cpp similarity index 100% rename from LEGO1/mxthread.cpp rename to LEGO1/omni/src/system/mxthread.cpp diff --git a/LEGO1/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp similarity index 100% rename from LEGO1/mxbitmap.cpp rename to LEGO1/omni/src/video/mxbitmap.cpp diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp similarity index 100% rename from LEGO1/mxdisplaysurface.cpp rename to LEGO1/omni/src/video/mxdisplaysurface.cpp diff --git a/LEGO1/mxpalette.cpp b/LEGO1/omni/src/video/mxpalette.cpp similarity index 100% rename from LEGO1/mxpalette.cpp rename to LEGO1/omni/src/video/mxpalette.cpp diff --git a/LEGO1/mxregion.cpp b/LEGO1/omni/src/video/mxregion.cpp similarity index 100% rename from LEGO1/mxregion.cpp rename to LEGO1/omni/src/video/mxregion.cpp diff --git a/LEGO1/mxregioncursor.cpp b/LEGO1/omni/src/video/mxregioncursor.cpp similarity index 100% rename from LEGO1/mxregioncursor.cpp rename to LEGO1/omni/src/video/mxregioncursor.cpp diff --git a/LEGO1/mxsmack.cpp b/LEGO1/omni/src/video/mxsmack.cpp similarity index 100% rename from LEGO1/mxsmack.cpp rename to LEGO1/omni/src/video/mxsmack.cpp diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp similarity index 100% rename from LEGO1/mxstillpresenter.cpp rename to LEGO1/omni/src/video/mxstillpresenter.cpp diff --git a/LEGO1/mxtransitionmanager.cpp b/LEGO1/omni/src/video/mxtransitionmanager.cpp similarity index 100% rename from LEGO1/mxtransitionmanager.cpp rename to LEGO1/omni/src/video/mxtransitionmanager.cpp diff --git a/LEGO1/mxvideoparam.cpp b/LEGO1/omni/src/video/mxvideoparam.cpp similarity index 100% rename from LEGO1/mxvideoparam.cpp rename to LEGO1/omni/src/video/mxvideoparam.cpp diff --git a/LEGO1/mxvideoparamflags.cpp b/LEGO1/omni/src/video/mxvideoparamflags.cpp similarity index 100% rename from LEGO1/mxvideoparamflags.cpp rename to LEGO1/omni/src/video/mxvideoparamflags.cpp diff --git a/LEGO1/racecar.cpp b/LEGO1/racecar.cpp deleted file mode 100644 index 0fbc97b9..00000000 --- a/LEGO1/racecar.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "racecar.h" - -DECOMP_SIZE_ASSERT(RaceCar, 0x164); - -// FUNCTION: LEGO1 0x10028200 -RaceCar::RaceCar() -{ - this->m_unk0x13c = 40.0; -} - -// STUB: LEGO1 0x10028420 -RaceCar::~RaceCar() -{ - // TODO -} diff --git a/LEGO1/racecar.h b/LEGO1/racecar.h deleted file mode 100644 index b4a210e6..00000000 --- a/LEGO1/racecar.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef RACECAR_H -#define RACECAR_H - -#include "decomp.h" -#include "islepathactor.h" - -// VTABLE: LEGO1 0x100d6918 -// SIZE 0x164 -class RaceCar : public IslePathActor { -public: - RaceCar(); - virtual ~RaceCar() override; // vtable+0x0 - - // FUNCTION: LEGO1 0x10028270 - inline virtual const char* ClassName() const override // vtable+0x0c - { - // STRING: LEGO1 0x100f03e0 - return "RaceCar"; - } - - // FUNCTION: LEGO1 0x10028280 - inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10 - { - return !strcmp(p_name, RaceCar::ClassName()) || IslePathActor::IsA(p_name); - } - -private: - // TODO: RaceCar fields - undefined m_unk0x160[4]; -}; - -#endif // RACECAR_H