Merge branch 'load-order-adjustment' into 'next'

Load sounds.kart after patch.kart

See merge request KartKrew/Kart-Public!13
This commit is contained in:
Sal 2019-01-06 01:51:41 -05:00
commit 50a6df7563

View file

@ -955,14 +955,10 @@ static void IdentifyVersion(void)
D_AddFile(va(pandf,srb2waddir,"textures.kart")); D_AddFile(va(pandf,srb2waddir,"textures.kart"));
D_AddFile(va(pandf,srb2waddir,"chars.kart")); D_AddFile(va(pandf,srb2waddir,"chars.kart"));
D_AddFile(va(pandf,srb2waddir,"maps.kart")); D_AddFile(va(pandf,srb2waddir,"maps.kart"));
//D_AddFile(va(pandf,srb2waddir,"sounds.kart"));
MUSICTEST("sounds.kart")
#ifdef USE_PATCH_KART #ifdef USE_PATCH_KART
D_AddFile(va(pandf,srb2waddir,"patch.kart")); D_AddFile(va(pandf,srb2waddir,"patch.kart"));
#endif #endif
MUSICTEST("sounds.kart")
//MUSICTEST("music.dta")
MUSICTEST("music.kart") MUSICTEST("music.kart")
} }