Merge branch 'level-select' into new-hud

1 files changed, 9 insertions, 0 deletions

diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index 164ea89..c20d715 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -46,6 +46,7 @@ dScKoopatlas_c *dScKoopatlas_c::build() {
 }
 
 bool WMInit_StartLoading(void*);
+bool StockWMInit_LoadEffects(void*);
 bool WMInit_LoadSIAnims(void*);
 bool WMInit_EndLoading(void*);
 bool WMInit_LoadResources1(void*);
@@ -56,6 +57,7 @@ bool WMInit_SetupWipe(void*);
 
 ChainedFunc initFunctions[] = {
 	WMInit_StartLoading,
+	StockWMInit_LoadEffects,
 	WMInit_LoadSIAnims,
 	WMInit_EndLoading,
 	WMInit_LoadResources1,
@@ -409,6 +411,11 @@ int dScKoopatlas_c::onDelete() {
 	FreeScene(0);
 	FreeScene(1);
 
+	CleanUpEffectThings();
+	FreeEffects(1);
+	FreeBreff(1);
+	FreeBreft(1);
+
 	DVD_FreeFile(GetDVDClass2(), "SI_kinoko");
 	DVD_FreeFile(GetDVDClass2(), "SI_fireflower");
 	DVD_FreeFile(GetDVDClass2(), "SI_iceflower");
@@ -419,6 +426,8 @@ int dScKoopatlas_c::onDelete() {
 	levelInfoLoader.unload();
 	mapListLoader.unload();
 
+	CleanUpEffectThings();
+
 	return true;
 }