1) Fixed some windows compilation issue.

2) Fixed typo (wrong mode comparison).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1771 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2008-04-29 03:25:20 +00:00
parent cff652a208
commit 831a4c76af

View File

@@ -21,6 +21,9 @@
#include "menu_manager.hpp"
#include "material_manager.hpp"
#include "translation.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf
#endif
enum WidgetTokens
{
@@ -89,8 +92,8 @@ RaceOptions::RaceOptions() :
widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 1, 1);
}
if( race_manager->getRaceMode() != ( RaceManager::RM_GRAND_PRIX ||
RaceManager::RM_FOLLOW_LEADER ))
if( race_manager->getRaceMode() != RaceManager::RM_GRAND_PRIX &&
race_manager->getRaceMode() != RaceManager::RM_FOLLOW_LEADER )
{
widget_manager->insertColumn();
widget_manager->addTextWgt( WTOK_LAPS_TITLE, 30, 7, _("Number of laps") );
@@ -230,8 +233,8 @@ void RaceOptions::select()
race_manager->setNumKarts(m_num_karts);
}
if( race_manager->getRaceMode() != ( RaceManager::RM_GRAND_PRIX ||
RaceManager::RM_FOLLOW_LEADER ))
if( race_manager->getRaceMode() != RaceManager::RM_GRAND_PRIX &&
race_manager->getRaceMode() != RaceManager::RM_FOLLOW_LEADER )
{
race_manager->setNumLaps( m_num_laps );
}