mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-22 07:54:23 +00:00
Fix mxomni.*
file names (#1654)
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
@@ -221,7 +221,7 @@ function(add_lego_libraries NAME)
|
|||||||
LEGO1/omni/src/common/mxcore.cpp
|
LEGO1/omni/src/common/mxcore.cpp
|
||||||
LEGO1/omni/src/common/mxstring.cpp
|
LEGO1/omni/src/common/mxstring.cpp
|
||||||
LEGO1/omni/src/audio/mxsoundmanager.cpp
|
LEGO1/omni/src/audio/mxsoundmanager.cpp
|
||||||
LEGO1/omni/src/main/mxomni.cpp
|
LEGO1/omni/src/main/mxmain.cpp
|
||||||
LEGO1/omni/src/notify/mxactionnotificationparam.cpp
|
LEGO1/omni/src/notify/mxactionnotificationparam.cpp
|
||||||
LEGO1/omni/src/main/mxomnicreateflags.cpp
|
LEGO1/omni/src/main/mxomnicreateflags.cpp
|
||||||
LEGO1/omni/src/main/mxomnicreateparam.cpp
|
LEGO1/omni/src/main/mxomnicreateparam.cpp
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include "compat.h"
|
#include "compat.h"
|
||||||
#include "mxdsaction.h"
|
#include "mxdsaction.h"
|
||||||
#include "mxomni.h"
|
#include "mxmain.h"
|
||||||
|
|
||||||
class Isle;
|
class Isle;
|
||||||
class LegoAnimationManager;
|
class LegoAnimationManager;
|
||||||
|
@@ -5,7 +5,7 @@
|
|||||||
#include "legosoundmanager.h"
|
#include "legosoundmanager.h"
|
||||||
#include "legovideomanager.h"
|
#include "legovideomanager.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "mxomni.h"
|
#include "mxmain.h"
|
||||||
|
|
||||||
#include <vec.h>
|
#include <vec.h>
|
||||||
|
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include "mxcompositepresenter.h"
|
#include "mxcompositepresenter.h"
|
||||||
#include "mxdsaction.h"
|
#include "mxdsaction.h"
|
||||||
#include "mxomni.h"
|
#include "mxmain.h"
|
||||||
|
|
||||||
DECOMP_SIZE_ASSERT(Lego3DWavePresenter, 0xa0)
|
DECOMP_SIZE_ASSERT(Lego3DWavePresenter, 0xa0)
|
||||||
|
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include "legosoundmanager.h"
|
#include "legosoundmanager.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "mxomni.h"
|
#include "mxmain.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include "legocachesoundmanager.h"
|
#include "legocachesoundmanager.h"
|
||||||
#include "mxautolock.h"
|
#include "mxautolock.h"
|
||||||
#include "mxomni.h"
|
#include "mxmain.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
#ifndef MXOMNI_H
|
#ifndef MXMAIN_H
|
||||||
#define MXOMNI_H
|
#define MXMAIN_H
|
||||||
|
|
||||||
#include "mxcore.h"
|
#include "mxcore.h"
|
||||||
#include "mxcriticalsection.h"
|
#include "mxcriticalsection.h"
|
||||||
@@ -120,4 +120,4 @@ protected:
|
|||||||
MxBool m_paused; // 0x64
|
MxBool m_paused; // 0x64
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // MXOMNI_H
|
#endif // MXMAIN_H
|
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
#include "mxautolock.h"
|
#include "mxautolock.h"
|
||||||
#include "mxdsaction.h"
|
#include "mxdsaction.h"
|
||||||
|
#include "mxmain.h"
|
||||||
#include "mxmisc.h"
|
#include "mxmisc.h"
|
||||||
#include "mxomni.h"
|
|
||||||
#include "mxpresenter.h"
|
#include "mxpresenter.h"
|
||||||
#include "mxticklemanager.h"
|
#include "mxticklemanager.h"
|
||||||
#include "mxticklethread.h"
|
#include "mxticklethread.h"
|
||||||
|
@@ -5,8 +5,8 @@
|
|||||||
#include "mxautolock.h"
|
#include "mxautolock.h"
|
||||||
#include "mxdssound.h"
|
#include "mxdssound.h"
|
||||||
#include "mxdssubscriber.h"
|
#include "mxdssubscriber.h"
|
||||||
|
#include "mxmain.h"
|
||||||
#include "mxmisc.h"
|
#include "mxmisc.h"
|
||||||
#include "mxomni.h"
|
|
||||||
#include "mxsoundmanager.h"
|
#include "mxsoundmanager.h"
|
||||||
#include "mxutilities.h"
|
#include "mxutilities.h"
|
||||||
|
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
#include "mxatom.h"
|
#include "mxatom.h"
|
||||||
|
|
||||||
#include "decomp.h"
|
#include "decomp.h"
|
||||||
|
#include "mxmain.h"
|
||||||
#include "mxmisc.h"
|
#include "mxmisc.h"
|
||||||
#include "mxomni.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
#include "mxmisc.h"
|
#include "mxmisc.h"
|
||||||
|
|
||||||
#include "mxomni.h"
|
#include "mxmain.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include "decomp.h"
|
#include "decomp.h"
|
||||||
#include "mxautolock.h"
|
#include "mxautolock.h"
|
||||||
#include "mxomni.h"
|
#include "mxmain.h"
|
||||||
#include "mxpresenter.h"
|
#include "mxpresenter.h"
|
||||||
#include "mxticklemanager.h"
|
#include "mxticklemanager.h"
|
||||||
|
|
||||||
|
@@ -13,11 +13,11 @@
|
|||||||
#include "mxloopingflcpresenter.h"
|
#include "mxloopingflcpresenter.h"
|
||||||
#include "mxloopingmidipresenter.h"
|
#include "mxloopingmidipresenter.h"
|
||||||
#include "mxloopingsmkpresenter.h"
|
#include "mxloopingsmkpresenter.h"
|
||||||
|
#include "mxmain.h"
|
||||||
#include "mxmidipresenter.h"
|
#include "mxmidipresenter.h"
|
||||||
#include "mxmisc.h"
|
#include "mxmisc.h"
|
||||||
#include "mxnotificationmanager.h"
|
#include "mxnotificationmanager.h"
|
||||||
#include "mxobjectfactory.h"
|
#include "mxobjectfactory.h"
|
||||||
#include "mxomni.h"
|
|
||||||
#include "mxparam.h"
|
#include "mxparam.h"
|
||||||
#include "mxsmkpresenter.h"
|
#include "mxsmkpresenter.h"
|
||||||
#include "mxstillpresenter.h"
|
#include "mxstillpresenter.h"
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
#include "mxomni.h"
|
#include "mxmain.h"
|
||||||
|
|
||||||
#include "mxactionnotificationparam.h"
|
#include "mxactionnotificationparam.h"
|
||||||
#include "mxatom.h"
|
#include "mxatom.h"
|
||||||
@@ -85,8 +85,6 @@ void MxOmni::SetInstance(MxOmni* p_instance)
|
|||||||
// FUNCTION: BETA10 0x1012f3ff
|
// FUNCTION: BETA10 0x1012f3ff
|
||||||
MxResult MxOmni::Create(MxOmniCreateParam& p_param)
|
MxResult MxOmni::Create(MxOmniCreateParam& p_param)
|
||||||
{
|
{
|
||||||
// TODO: File name is MxMain.cpp according to BETA10
|
|
||||||
|
|
||||||
MxResult result = FAILURE;
|
MxResult result = FAILURE;
|
||||||
|
|
||||||
if (!(m_atomSet = new MxAtomSet())) {
|
if (!(m_atomSet = new MxAtomSet())) {
|
@@ -4,8 +4,8 @@
|
|||||||
#include "mxautolock.h"
|
#include "mxautolock.h"
|
||||||
#include "mxdiskstreamprovider.h"
|
#include "mxdiskstreamprovider.h"
|
||||||
#include "mxdsstreamingaction.h"
|
#include "mxdsstreamingaction.h"
|
||||||
|
#include "mxmain.h"
|
||||||
#include "mxmisc.h"
|
#include "mxmisc.h"
|
||||||
#include "mxomni.h"
|
|
||||||
#include "mxticklemanager.h"
|
#include "mxticklemanager.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
@@ -5,7 +5,7 @@
|
|||||||
#include "mxdsbuffer.h"
|
#include "mxdsbuffer.h"
|
||||||
#include "mxdsfile.h"
|
#include "mxdsfile.h"
|
||||||
#include "mxdsstreamingaction.h"
|
#include "mxdsstreamingaction.h"
|
||||||
#include "mxomni.h"
|
#include "mxmain.h"
|
||||||
#include "mxramstreamprovider.h"
|
#include "mxramstreamprovider.h"
|
||||||
#include "mxstreamcontroller.h"
|
#include "mxstreamcontroller.h"
|
||||||
#include "mxstring.h"
|
#include "mxstring.h"
|
||||||
|
@@ -3,8 +3,8 @@
|
|||||||
#include "mxdiskstreamcontroller.h"
|
#include "mxdiskstreamcontroller.h"
|
||||||
#include "mxdschunk.h"
|
#include "mxdschunk.h"
|
||||||
#include "mxdsstreamingaction.h"
|
#include "mxdsstreamingaction.h"
|
||||||
|
#include "mxmain.h"
|
||||||
#include "mxmisc.h"
|
#include "mxmisc.h"
|
||||||
#include "mxomni.h"
|
|
||||||
#include "mxstreamchunk.h"
|
#include "mxstreamchunk.h"
|
||||||
#include "mxstreamcontroller.h"
|
#include "mxstreamcontroller.h"
|
||||||
#include "mxstreamer.h"
|
#include "mxstreamer.h"
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
#include "decomp.h"
|
#include "decomp.h"
|
||||||
#include "mxdsbuffer.h"
|
#include "mxdsbuffer.h"
|
||||||
#include "mxdsfile.h"
|
#include "mxdsfile.h"
|
||||||
#include "mxomni.h"
|
#include "mxmain.h"
|
||||||
#include "mxstreamcontroller.h"
|
#include "mxstreamcontroller.h"
|
||||||
|
|
||||||
DECOMP_SIZE_ASSERT(MxStreamProvider, 0x10)
|
DECOMP_SIZE_ASSERT(MxStreamProvider, 0x10)
|
||||||
|
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
#include "mxbitmap.h"
|
#include "mxbitmap.h"
|
||||||
#include "mxdebug.h"
|
#include "mxdebug.h"
|
||||||
|
#include "mxmain.h"
|
||||||
#include "mxmisc.h"
|
#include "mxmisc.h"
|
||||||
#include "mxomni.h"
|
|
||||||
#include "mxpalette.h"
|
#include "mxpalette.h"
|
||||||
#include "mxutilities.h"
|
#include "mxutilities.h"
|
||||||
#include "mxvideomanager.h"
|
#include "mxvideomanager.h"
|
||||||
|
@@ -6,8 +6,8 @@
|
|||||||
#include "mxdisplaysurface.h"
|
#include "mxdisplaysurface.h"
|
||||||
#include "mxdsmediaaction.h"
|
#include "mxdsmediaaction.h"
|
||||||
#include "mxdssubscriber.h"
|
#include "mxdssubscriber.h"
|
||||||
|
#include "mxmain.h"
|
||||||
#include "mxmisc.h"
|
#include "mxmisc.h"
|
||||||
#include "mxomni.h"
|
|
||||||
#include "mxpalette.h"
|
#include "mxpalette.h"
|
||||||
#include "mxutilities.h"
|
#include "mxutilities.h"
|
||||||
#include "mxvideomanager.h"
|
#include "mxvideomanager.h"
|
||||||
|
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
#include "mxautolock.h"
|
#include "mxautolock.h"
|
||||||
#include "mxdisplaysurface.h"
|
#include "mxdisplaysurface.h"
|
||||||
|
#include "mxmain.h"
|
||||||
#include "mxmisc.h"
|
#include "mxmisc.h"
|
||||||
#include "mxomni.h"
|
|
||||||
#include "mxpalette.h"
|
#include "mxpalette.h"
|
||||||
#include "mxpresenter.h"
|
#include "mxpresenter.h"
|
||||||
#include "mxregion.h"
|
#include "mxregion.h"
|
||||||
|
Reference in New Issue
Block a user