From 777292a74f579ddb110562d61113ec9adf8a877d Mon Sep 17 00:00:00 2001 From: aeonphyxius Date: Fri, 10 Dec 2010 01:42:08 +0000 Subject: [PATCH]
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6940 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- data/gui/main.stkgui | 3 +++ src/config/user_config.hpp | 2 ++ src/ide/codeblocks/supertuxkart.layout | 4 ++-- src/ide/vc9/supertuxkart.vcproj | 18 +++++++++++++++++- src/main.cpp | 4 ++++ src/states_screens/main_menu_screen.cpp | 7 +++++++ 6 files changed, 35 insertions(+), 3 deletions(-) diff --git a/data/gui/main.stkgui b/data/gui/main.stkgui index fb3aab910..2b5de7141 100644 --- a/data/gui/main.stkgui +++ b/data/gui/main.stkgui @@ -12,6 +12,9 @@ + diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp index fae3d23bd..daac276d7 100644 --- a/src/config/user_config.hpp +++ b/src/config/user_config.hpp @@ -260,6 +260,8 @@ namespace UserConfigParams "Type of the renderer.") ); // ---- Debug - not saved to config file + /** If tutorial game mode debugging is enabled. */ + PARAM_PREFIX bool m_tutorial_debug PARAM_DEFAULT( false ); /** If gamepad debugging is enabled. */ PARAM_PREFIX bool m_gamepad_debug PARAM_DEFAULT( false ); /** If material debugging (printing terrain specific slowdown) is enabled. */ diff --git a/src/ide/codeblocks/supertuxkart.layout b/src/ide/codeblocks/supertuxkart.layout index 06754f273..10028c85a 100644 --- a/src/ide/codeblocks/supertuxkart.layout +++ b/src/ide/codeblocks/supertuxkart.layout @@ -31,13 +31,13 @@ - + - + diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj index 434205318..ea242370c 100644 --- a/src/ide/vc9/supertuxkart.vcproj +++ b/src/ide/vc9/supertuxkart.vcproj @@ -1,7 +1,7 @@ + + @@ -1046,6 +1050,10 @@ RelativePath="..\..\states_screens\tracks_screen.cpp" > + + @@ -1392,6 +1400,10 @@ RelativePath="..\..\modes\follow_the_leader.hpp" > + + @@ -1940,6 +1952,10 @@ RelativePath="..\..\states_screens\tracks_screen.hpp" > + + diff --git a/src/main.cpp b/src/main.cpp index d5b1484b8..1144775bd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -249,6 +249,10 @@ int handleCmdLine(int argc, char **argv) { UserConfigParams::m_gamepad_debug=true; } + else if (sscanf(argv[i], "--tutorial-debug=%d",&n)==1) // ASV TBC + { + UserConfigParams::m_tutorial_debug=n; + } else if(sscanf(argv[i], "--track-debug=%d",&n)==1) { UserConfigParams::m_track_debug=n; diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp index 162d39639..ee276b11f 100644 --- a/src/states_screens/main_menu_screen.cpp +++ b/src/states_screens/main_menu_screen.cpp @@ -37,6 +37,9 @@ #include "states_screens/state_manager.hpp" #include "io/file_manager.hpp" +//FIXME : remove, temporary tutorial test +#include "states_screens/tutorial_screen.hpp" + // FIXME : remove, temporary test #include "states_screens/feature_unlocked.hpp" #include "states_screens/grand_prix_lose.hpp" @@ -223,6 +226,10 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, cons { StateManager::get()->pushScreen(ChallengesScreen::getInstance()); } + else if (selection == "tutorial") + { + StateManager::get()->pushScreen(TutorialScreen::getInstance()); + } #ifdef ADDONS_MANAGER else if (selection == "addons") {