1195 Multiplayer Kart Selection commit 19

src/guiengine/skin.cpp

@@ -1270,8 +1270,6 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget,
         rect2.LowerRightCorner.Y += 5;
         drawBoxFromStretchableTexture(widget, rect2,
                      SkinConfig::m_render_params["squareFocusHalo2::neutral"]);
-        
-
     }
     else if (widget->isFocusedForPlayer(2))
     {
@@ -1293,7 +1291,7 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget,
         drawBoxFromStretchableTexture(widget, rect2,
                      SkinConfig::m_render_params["squareFocusHalo4::neutral"]);
     }
-    
+
     core::recti sized_rect = rect;
     if (m_dialog && m_dialog_size < 1.0f && widget->m_parent != NULL &&
         widget->m_parent->getType() == gui::EGUIET_WINDOW)
@@ -1318,7 +1316,7 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget,
     drawBoxFromStretchableTexture(widget, sized_rect, params,
                                   widget->m_deactivated);
 
-   
+
     // ---- If this spinner is of "gauge" type, draw filling
     const SpinnerWidget* w = dynamic_cast<const SpinnerWidget*>(widget);
     

src/guiengine/skin.hpp

@@ -318,7 +318,7 @@ namespace GUIEngine
                                  const bool pressed, const bool bottomArrow);
 
         void drawTooltip(Widget* widget, bool atMouse);
-	
+
 
     public:
 

src/guiengine/widgets/spinner_widget.cpp

@@ -108,9 +108,8 @@ void SpinnerWidget::add()
     rect<s32> widget_size = rect<s32>(m_x, m_y, m_x + m_w, m_y + m_h);
     IGUIButton * btn = GUIEngine::getGUIEnv()->addButton(widget_size, m_parent, widgetID, L"");
     m_element = btn;
-    
-    m_element->setTabOrder( m_element->getID() );
 
+    m_element->setTabOrder( m_element->getID() );
 	
     // left arrow
     rect<s32> subsize_left_arrow = rect<s32>(0 ,0, m_h, m_h);
@@ -120,7 +119,7 @@ void SpinnerWidget::add()
     m_children[0].m_event_handler = this;
     m_children[0].m_properties[PROP_ID] = "left";
     m_children[0].m_id = m_children[0].m_element->getID();
-    
+
     m_badge_x_shift = subsize_left_arrow.getWidth();
 
     // label
@@ -164,7 +163,7 @@ void SpinnerWidget::add()
         }
 	
     }
-   
+
 
     // right arrow
     rect<s32> subsize_right_arrow = rect<s32>(m_w - m_h, 0, m_w, m_h);
@@ -180,6 +179,7 @@ void SpinnerWidget::add()
 
     setValue(m_value);
 }
+// -----------------------------------------------------------------------------
 
 ITexture* SpinnerWidget::getTexture()
 {
@@ -368,8 +368,6 @@ stringw SpinnerWidget::getStringValue() const
     return "";
 }
 
-
-
 // -----------------------------------------------------------------------------
 
 void SpinnerWidget::setValue(irr::core::stringw new_value)

src/guiengine/widgets/spinner_widget.hpp

@@ -97,9 +97,7 @@ namespace GUIEngine
         
         /** Call only if this spinner is graphical. Returns the current texture to display */
         irr::video::ITexture* getTexture();
-	// to set the background image
+       
-//	irr::video::ITexture* getBackgroundColor();
-        
     public:
         
         LEAK_CHECK()
@@ -179,9 +177,8 @@ namespace GUIEngine
 
         /** Display custom text in spinner */
         void setCustomText(const core::stringw& text);
-
     };
-    
+
 }
 
 #endif

src/states_screens/kart_selection.cpp

@@ -138,7 +138,7 @@ PlayerNameSpinner::PlayerNameSpinner(KartSelectionScreen* parent,
 
     setUseBackgroundColor();//except for multiplayer kart selection, this is false
     setSpinnerWidgetPlayerID(m_player_id);
-}
+}   // PlayerNameSpinner
 // ------------------------------------------------------------------------
 void PlayerNameSpinner::setID(const int m_player_id)
 {
@@ -233,7 +233,6 @@ PlayerKartWidget::PlayerKartWidget(KartSelectionScreen* parent,
     m_player_ident_spinner->m_y = player_name_y;
     m_player_ident_spinner->m_w = player_name_w;
     m_player_ident_spinner->m_h = player_name_h;
-    
 
     if (parent->m_multiplayer && associated_player)
     {
@@ -488,8 +487,7 @@ void PlayerKartWidget::add()
         const int player_amount = PlayerManager::get()->getNumPlayers();
         for (int n=0; n<player_amount; n++)
         {
-            core::stringw name = PlayerManager::get()->getPlayer(n)->getName();
+            core::stringw name = PlayerManager::get()->getPlayer(n)->getName(); 	
-	    	
             m_player_ident_spinner->addLabel( translations->fribidize(name) );
         }
 
@@ -1837,7 +1835,6 @@ bool KartSelectionScreen::validateIdentChoices()
     // perform actual checking
     for (int n=0; n<amount; n++)
     {
-	
         // skip players that took a guest account, they can be many on the
         // same identity in this case
         if (m_kart_widgets[n].getAssociatedPlayer()->getProfile()
@@ -2099,8 +2096,6 @@ EventPropagation FocusDispatcher::focused(const int playerID)
     const int amount = m_parent->m_kart_widgets.size();
     for (int n=0; n<amount; n++)
     {
-	          
-
         if (m_parent->m_kart_widgets[n].getPlayerID() == playerID)
         {
             // If player is done, don't do anything with focus

src/states_screens/kart_selection.hpp

@@ -216,8 +216,7 @@ public:
 
     // ------------------------------------------------------------------------
     /** Remove any red mark set with 'markAsIncorrect' */
-    void markAsCorrect();
+    void markAsCorrect();  
-    
 };
 
 /** A widget representing the kart selection for a player (i.e. the player's