Added menu to select the number of karts.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1595 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/Makefile.am

@@ -99,6 +99,7 @@ supertuxkart_SOURCES =             main.cpp  			\
 	gui/race_results_gui.cpp   gui/race_results_gui.hpp 	\
 	gui/grand_prix_ending.cpp  gui/grand_prix_ending.hpp 	\
 	gui/num_laps.cpp	   gui/num_laps.hpp	        \
+	gui/num_karts.cpp	   gui/num_karts.hpp	        \
 	gui/race_menu.cpp	   gui/race_menu.hpp	        \
 	gui/num_players.cpp	   gui/num_players.hpp       	\
 	gui/track_sel.cpp	   gui/track_sel.hpp	        \

src/gui/char_sel.cpp

@@ -235,11 +235,12 @@ void CharSel::select()
         }
     }
 
-    if (race_manager->getRaceMode() != RaceSetup::RM_GRAND_PRIX)
-        menu_manager->pushMenu(MENUID_TRACKSEL);
+    if (race_manager->getRaceMode() == RaceSetup::RM_GRAND_PRIX)
+        menu_manager->pushMenu(MENUID_NUMKARTS);
     else
-        race_manager->start();
-}
+        menu_manager->pushMenu(MENUID_TRACKSEL);
+}   // select
+
 //----------------------------------------------------------------------------
 // Function checks the vector of previously selected karts and returns true if
 // kart i is in the vector and false if it is not.

src/gui/menu_manager.cpp

@@ -31,6 +31,7 @@
 #include "options.hpp"
 #include "track_sel.hpp"
 #include "num_laps.hpp"
+#include "num_karts.hpp"
 #include "num_players.hpp"
 #include "config_controls.hpp"
 #include "config_display.hpp"
@@ -164,6 +165,9 @@ void MenuManager::update()
             case MENUID_NUMLAPS:
                 m_current_menu= new NumLaps();
                 break;
+            case MENUID_NUMKARTS:
+                m_current_menu= new NumKarts();
+                break;
             case MENUID_NUMPLAYERS:
                 m_current_menu= new NumPlayers();
                 break;

src/gui/menu_manager.hpp

@@ -38,6 +38,7 @@ enum MenuManagerIDs
     MENUID_GRANDPRIXEND,
     MENUID_RACEMENU,
     MENUID_TRACKSEL,
+    MENUID_NUMKARTS,
     MENUID_NUMLAPS,
     MENUID_NUMPLAYERS,
     MENUID_OPTIONS,

src/gui/track_sel.cpp

@@ -246,8 +246,14 @@ void TrackSel::select()
     const int CLICKED_TOKEN = widget_manager->getSelectedWgt();
     const Track* TRACK = track_manager->getTrack(CLICKED_TOKEN - WTOK_TRACK0);
     race_manager->setTrack(TRACK->getIdent());
-
-    menu_manager->pushMenu(MENUID_NUMLAPS);
-}
+    if(race_manager->getRaceMode()==RaceSetup::RM_TIME_TRIAL)
+    {
+        menu_manager->pushMenu(MENUID_NUMLAPS);
+    }
+    else
+    {
+        menu_manager->pushMenu(MENUID_NUMKARTS);
+    }
+}   // select
 
 /* EOF */

src/ide/vc8/supertuxkart.vcproj

@@ -981,6 +981,10 @@
 					RelativePath="../../../src\gui\menu_manager.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\gui\num_karts.cpp"
+					>
+				</File>
 				<File
 					RelativePath="../../../src\gui\num_laps.cpp"
 					>
@@ -1403,6 +1407,10 @@
 					RelativePath="../../../src\gui\menu_manager.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\gui\num_karts.hpp"
+					>
+				</File>
 				<File
 					RelativePath="../../../src\gui\num_laps.hpp"
 					>