diff --git a/CMakeLists.txt b/CMakeLists.txt index ff991cb6..b9aaee28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -357,14 +357,14 @@ function(add_lego_libraries NAME) LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp LEGO1/lego/legoomni/src/worlds/legoact2.cpp - - LEGO1/lego/legoomni/src/actors/act3ammo.cpp - LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp LEGO1/lego/legoomni/src/main/scripts.cpp LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp + LEGO1/lego/legoomni/src/actors/act3ammo.cpp LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp LEGO1/lego/legoomni/src/paths/legopathboundary.cpp LEGO1/lego/legoomni/src/main/legomain.cpp + + LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp LEGO1/lego/legoomni/src/input/legoinputmanager.cpp LEGO1/lego/legoomni/src/race/legoracemap.cpp LEGO1/lego/legoomni/src/worlds/jukebox.cpp diff --git a/LEGO1/lego/legoomni/src/main/legomain.cpp b/LEGO1/lego/legoomni/src/main/legomain.cpp index f69cc43c..fe37070c 100644 --- a/LEGO1/lego/legoomni/src/main/legomain.cpp +++ b/LEGO1/lego/legoomni/src/main/legomain.cpp @@ -21,7 +21,6 @@ #include "mxautolock.h" #include "mxbackgroundaudiomanager.h" #include "mxdisplaysurface.h" -#include "mxdsfile.h" #include "mxmisc.h" #include "mxnotificationmanager.h" #include "mxomnicreateflags.h" diff --git a/LEGO1/lego/sources/misc/legocontainer.h b/LEGO1/lego/sources/misc/legocontainer.h index 72db3332..fd439912 100644 --- a/LEGO1/lego/sources/misc/legocontainer.h +++ b/LEGO1/lego/sources/misc/legocontainer.h @@ -27,6 +27,8 @@ class LegoContainerInfo : public map class LegoContainer { public: + LegoContainer() { m_ownership = TRUE; } + virtual ~LegoContainer() { #ifdef COMPAT_MODE @@ -115,7 +117,6 @@ typedef list LegoCachedTextureList; // SIZE 0x24 class LegoTextureContainer : public LegoContainer { public: - LegoTextureContainer() { m_ownership = TRUE; } ~LegoTextureContainer() override; LegoTextureInfo* GetCached(LegoTextureInfo* p_textureInfo);