ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2014-10-28 09:02:35 +11:00
commit 9e9ce47a2b
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/skins/peach/achievement.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
data/skins/peach/friend.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

6
src/modes/world.cpp
View File

@ -826,7 +826,7 @@ void World::updateWorld(float dt)
if (m_schedule_exit_race)
{
m_schedule_exit_race = false;
race_manager->exitRace();
race_manager->exitRace(false);
race_manager->setAIKartOverride("");
StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
@ -864,12 +864,16 @@ void World::updateWorld(float dt)
input_manager->getDeviceManager()
->setSinglePlayer( StateManager::get()->getActivePlayer(0) );
delete this;
StateManager::get()->enterGameState();
race_manager->setupPlayerKartInfo();
race_manager->startNew(true);
}
else
{
delete this;
if (race_manager->raceWasStartedFromOverworld())
{
OverWorld::enterOverWorld();