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

Clicking 'continue' on feature unlocked screen should now work

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4890 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2010-03-01 20:53:40 +00:00
parent d27e3d90c5
commit 17d01a88e4
1 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/states_screens/feature_unlocked.cpp
View File

@@ -5,6 +5,8 @@
#include "guiengine/engine.hpp"
#include "io/file_manager.hpp"
#include "items/item_manager.hpp"
#include "modes/world.hpp"
#include "states_screens/main_menu_screen.hpp"
#include "states_screens/state_manager.hpp"
#include "utils/translation.hpp"
@@ -152,6 +154,9 @@ void FeatureUnlockedCutScene::tearDown()
irr_driver->removeNode(m_root_gift_node);
m_root_gift_node = NULL;
}
// this is called maybe in the middle of a GP, so ask the race manager to continue
race_manager->next();
}
// -------------------------------------------------------------------------------------
@@ -253,10 +258,44 @@ void FeatureUnlockedCutScene::eventCallback(GUIEngine::Widget* widget,
const std::string& name,
const int playerID)
{
if (name == "back")
if (name == "continue")
{
StateManager::get()->escapePressed();
if (race_manager->getMajorMode() == RaceManager::MAJOR_MODE_GRAND_PRIX)
{
// in GP mode, continue GP after viewing this screen (TODO: test)
World::getWorld()->unpause();
race_manager->next();
}
else
{
// back to menu
race_manager->exitRace();
StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
}
}
/*
if (eventSource == "raceagainbtn")
{
network_manager->setState(NetworkManager::NS_MAIN_MENU);
World::getWorld()->unpause();
race_manager->rerunRace();
return GUIEngine::EVENT_BLOCK;
}
else if (eventSource == "backtomenu")
{
World::getWorld()->unpause();
race_manager->exitRace();
StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
return GUIEngine::EVENT_BLOCK;
}
else if (eventSource == "continuegp")
{
World::getWorld()->unpause();
race_manager->next();
return GUIEngine::EVENT_BLOCK;
}*/
}
// -------------------------------------------------------------------------------------