Skip to content

Commit bd01b0c

Browse files
committed
Fix a small regression
Karts that should be unlocked in Story Mode were not properly locked. The regression was introduced in 32c5ac0, because the kart information was loaded after the UnlockManager. Moving the kart loading back before fixes the issue.
1 parent ec8c646 commit bd01b0c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/main.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2383,6 +2383,14 @@ int main(int argc, char *argv[])
23832383
else
23842384
main_loop = new MainLoop(0/*parent_pid*/);
23852385

2386+
// Set of loading steps common between the first game launch and
2387+
// reloading to apply a new resolution.
2388+
irr_driver->commonInit();
2389+
2390+
OfficialKarts::load();
2391+
handleXmasMode();
2392+
handleEasterEarMode();
2393+
23862394
// Needs the kart and track directories to load potential challenges
23872395
// in those dirs, so it can only be created after reading tracks
23882396
// and karts.
@@ -2397,14 +2405,6 @@ int main(int argc, char *argv[])
23972405
GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI_ICON,
23982406
"gui_lock.png" ) );
23992407

2400-
// Set of loading steps common between the first game launch and
2401-
// reloading to apply a new resolution.
2402-
irr_driver->commonInit();
2403-
2404-
OfficialKarts::load();
2405-
handleXmasMode();
2406-
handleEasterEarMode();
2407-
24082408
//handleCmdLine() needs InitTuxkart() so it can't be called first
24092409
if (!handleCmdLine(!server_config.empty(), has_parent_process))
24102410
exit(0);

0 commit comments

Comments
 (0)