Changeset 12489

Timestamp:

02/16/13 16:43:13 (3 months ago)

Author:

auria

Message:

Move tutorial to help menu

Location:

main/trunk

Files:

• data/gui/help1.stkgui (modified) (2 diffs)
• data/gui/main.stkgui (modified) (2 diffs)
• src/states_screens/help_screen_1.cpp (modified) (2 diffs)
• src/states_screens/main_menu_screen.cpp (modified) (1 diff)

main/trunk/data/gui/help1.stkgui

@@ -19 +19 @@
 
     <box proportion="1" width="100%" layout="vertical-row">
+
+        <spacer width="5" height="15"/>
+        <button id="startTutorial" text="Click here to play the tutorial" align="center"/>
+        <spacer width="5" height="15"/>
     
-        <label align="center" I18N="In the help menu" text="Make your rivals bite dust!"/>
-
         <div width="100%" proportion="2" layout="horizontal-row">
             <icon align="center" width="64" height="64" icon="gui/gift.png"/>
@@ -36 +38 @@
         </div>
         
-        <div width="100%" proportion="2" layout="horizontal-row">
+        <div width="100%" proportion="3" layout="horizontal-row">
             <icon align="center" width="64" height="64" icon="gui/nitro.png"/>
             <spacer width="25" height="25"/>

main/trunk/data/gui/main.stkgui

@@ +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     
@@ -38 +39 @@
                 <icon-button id="help" width="64" height="64" icon="gui/main_help.png"  extend_label="50"
                              I18N="Main menu button" text="Help" label_location="hover"/>
-                <icon-button id="startTutorial" width="64" height="64" icon="gui/main_help.png" extend_label="150"
-                             I18N="Main menu button" text="Tutorial" label_location="hover"/>
                 <icon-button id="about" width="64" height="64" icon="gui/main_about.png"  extend_label="50"
                              I18N="Main menu button" text="About" label_location="hover"/>

main/trunk/src/states_screens/help_screen_1.cpp

@@ -18 +18 @@
 #include "states_screens/help_screen_1.hpp"
 
+#include "challenges/unlock_manager.hpp"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
+#include "input/device_manager.hpp"
+#include "input/input_manager.hpp"
+#include "karts/kart_properties_manager.hpp"
+#include "network/network_manager.hpp"
+#include "race/race_manager.hpp"
 #include "states_screens/help_screen_2.hpp"
 #include "states_screens/help_screen_3.hpp"
@@ -45 +51 @@
 void HelpScreen1::eventCallback(Widget* widget, const std::string& name, const int playerID)
 {
-    if (name == "category")
+    if (name == "startTutorial")
+    {
+        race_manager->setNumLocalPlayers(1);
+        race_manager->setMajorMode (RaceManager::MAJOR_MODE_SINGLE);
+        race_manager->setMinorMode (RaceManager::MINOR_MODE_TUTORIAL);
+        race_manager->setNumKarts( 1 );
+        race_manager->setTrack( "tutorial" );
+        race_manager->setDifficulty(RaceManager::DIFFICULTY_EASY);
+        
+        // Use keyboard 0 by default (FIXME: let player choose?)
+        InputDevice* device = input_manager->getDeviceList()->getKeyboard(0);
+
+        // Create player and associate player with keyboard
+        StateManager::get()->createActivePlayer(unlock_manager->getCurrentPlayer(),
+                                                device);
+        
+        if (kart_properties_manager->getKart(UserConfigParams::m_default_kart) == NULL)
+        {
+            fprintf(stderr, "[MainMenuScreen] WARNING: cannot find kart '%s', will revert to default\n",
+                    UserConfigParams::m_default_kart.c_str());
+            UserConfigParams::m_default_kart.revertToDefaults();
+        }
+        race_manager->setLocalKartInfo(0, UserConfigParams::m_default_kart);
+        
+        // ASSIGN should make sure that only input from assigned devices
+        // is read.
+        input_manager->getDeviceList()->setAssignMode(ASSIGN);
+        input_manager->getDeviceList()
+            ->setSinglePlayer( StateManager::get()->getActivePlayer(0) );
+        
+        StateManager::get()->enterGameState();
+        network_manager->setupPlayerKartInfo();
+        race_manager->startNew(false);
+    }
+    else if (name == "category")
     {
         std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER).c_str();

main/trunk/src/states_screens/main_menu_screen.cpp

@@ -301 +301 @@
         StateManager::get()->pushScreen(HelpScreen1::getInstance());
     }
-    else if (selection == "startTutorial")
-    {    
-        race_manager->setNumLocalPlayers(1);
-        race_manager->setMajorMode (RaceManager::MAJOR_MODE_SINGLE);
-        race_manager->setMinorMode (RaceManager::MINOR_MODE_TUTORIAL);
-        race_manager->setNumKarts( 1 );
-        race_manager->setTrack( "tutorial" );
-        race_manager->setDifficulty(RaceManager::DIFFICULTY_EASY);
-        
-        // Use keyboard 0 by default (FIXME: let player choose?)
-        InputDevice* device = input_manager->getDeviceList()->getKeyboard(0);
-
-        // Create player and associate player with keyboard
-        StateManager::get()->createActivePlayer(unlock_manager->getCurrentPlayer(),
-                                                device);
-        
-        if (kart_properties_manager->getKart(UserConfigParams::m_default_kart) == NULL)
-        {
-            fprintf(stderr, "[MainMenuScreen] WARNING: cannot find kart '%s', will revert to default\n",
-                    UserConfigParams::m_default_kart.c_str());
-            UserConfigParams::m_default_kart.revertToDefaults();
-        }
-        race_manager->setLocalKartInfo(0, UserConfigParams::m_default_kart);
-        
-        // ASSIGN should make sure that only input from assigned devices
-        // is read.
-        input_manager->getDeviceList()->setAssignMode(ASSIGN);
-        input_manager->getDeviceList()
-            ->setSinglePlayer( StateManager::get()->getActivePlayer(0) );
-        
-        StateManager::get()->enterGameState();
-        network_manager->setupPlayerKartInfo();
-        race_manager->startNew(false);
-    }
     else if (selection == "story")
     {