Reorganize sources

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)

LEGO1/buildingentity.cpp

@@ -1,13 +0,0 @@
-#include "buildingentity.h"
-
-// STUB: LEGO1 0x10014e20
-BuildingEntity::BuildingEntity()
-{
-	// TODO
-}
-
-// STUB: LEGO1 0x10015030
-BuildingEntity::~BuildingEntity()
-{
-	// TODO
-}

LEGO1/buildingentity.h

@@ -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

LEGO1/dunebuggy.cpp

@@ -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;
-}

LEGO1/dunebuggy.h

@@ -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

LEGO1/helicopter.cpp

@@ -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;
-}

LEGO1/helicopter.h

@@ -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

LEGO1/helicopterstate.cpp

@@ -1 +0,0 @@
-#include "helicopterstate.h"

LEGO1/helicopterstate.h

@@ -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

LEGO1/jetski.cpp

@@ -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;
-}

LEGO1/jetski.h

@@ -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

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)

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

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<LegoUnknown100d7c88 *>
+
+// VTABLE: LEGO1 0x100d9ce8
+// class MxList<LegoUnknown100d7c88 *>
+
+// VTABLE: LEGO1 0x100d9d00
+// SIZE 0x18
+class LegoUnknown100d9d00 : public MxList<LegoUnknown100d7c88*> {
+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<LegoUnknown100d7c88 *>::Compare
+
+// TEMPLATE: LEGO1 0x1007b360
+// MxCollection<LegoUnknown100d7c88 *>::Destroy
+
+// SYNTHETIC: LEGO1 0x1007b400
+// LegoUnknown100d9d00::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1007b470
+// MxCollection<LegoUnknown100d7c88 *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1007b4e0
+// MxList<LegoUnknown100d7c88 *>::`scalar deleting destructor'
+
+#endif // LEGOUNKNOWN100D9D00_H

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 <ddraw.h>
@@ -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