diff options
author | Colin Noga <Tempus@chronometry.ca> | 2012-12-08 14:13:53 -0600 |
---|---|---|
committer | Colin Noga <Tempus@chronometry.ca> | 2012-12-08 14:13:53 -0600 |
commit | da3aa8b641e21a766b4212385e434ff2f9927e98 (patch) | |
tree | 16ed9a79f04bbc4bfdc0bb6b1b4d551df044c812 /src/koopatlas/core.cpp | |
parent | 16d563a330e1a3190b6212a0bca2a4c80e2b5cff (diff) | |
parent | 3e1eddbcca15042a7a63f29f5db3ce66237355b9 (diff) | |
download | kamek-da3aa8b641e21a766b4212385e434ff2f9927e98.tar.gz kamek-da3aa8b641e21a766b4212385e434ff2f9927e98.zip |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to 'src/koopatlas/core.cpp')
-rw-r--r-- | src/koopatlas/core.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp index 03b8dae..71122e5 100644 --- a/src/koopatlas/core.cpp +++ b/src/koopatlas/core.cpp @@ -47,6 +47,7 @@ dScKoopatlas_c *dScKoopatlas_c::build() { } bool WMInit_StartLoading(void*); +bool WMInit_LoadStaticFiles(void*); bool StockWMInit_LoadEffects(void*); bool WMInit_LoadSIAnims(void*); bool WMInit_EndLoading(void*); @@ -58,6 +59,7 @@ bool WMInit_SetupWipe(void*); ChainedFunc initFunctions[] = { WMInit_StartLoading, + WMInit_LoadStaticFiles, StockWMInit_LoadEffects, WMInit_LoadSIAnims, WMInit_EndLoading, @@ -135,6 +137,10 @@ bool WMInit_StartLoading(void *ptr) { return true; } +bool WMInit_LoadStaticFiles(void *ptr) { + return dKPMusic::loadInfo(); +} + bool WMInit_LoadSIAnims(void *ptr) { SpammyReport("WMInit_LoadSIAnims called\n"); |