From 86743991ae16394dd2a940bc96ed7e7105819980 Mon Sep 17 00:00:00 2001 From: hikerstk Date: Wed, 2 Sep 2009 02:08:24 +0000 Subject: [PATCH] Updated project file, removed VS compiler warnings. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3985 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/ide/vc9/supertuxkart.vcproj | 8 ++++++++ src/race/race_manager.hpp | 2 +- src/states_screens/dialogs/race_over_dialog.cpp | 2 +- src/utils/string_utils.cpp | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj index 409b245c6..694d579e3 100644 --- a/src/ide/vc9/supertuxkart.vcproj +++ b/src/ide/vc9/supertuxkart.vcproj @@ -815,6 +815,10 @@ RelativePath="..\..\states_screens\dialogs\press_a_key_dialog.cpp" > + + @@ -1529,6 +1533,10 @@ RelativePath="..\..\states_screens\dialogs\press_a_key_dialog.hpp" > + + diff --git a/src/race/race_manager.hpp b/src/race/race_manager.hpp index 2f0b6502a..689dd1ccd 100644 --- a/src/race/race_manager.hpp +++ b/src/race/race_manager.hpp @@ -236,7 +236,7 @@ public: int getPositionScore(int p) const { return m_score_for_position[p-1]; } bool allPlayerFinished() const {return m_num_finished_players==m_player_karts.size();} - int raceIsActive() const { return m_active_race; } + bool raceIsActive() const { return m_active_race; } const std::vector& getRandomKartList() const { return m_random_kart_list; } void setRandomKartList(const std::vector& rkl) diff --git a/src/states_screens/dialogs/race_over_dialog.cpp b/src/states_screens/dialogs/race_over_dialog.cpp index c5e744fc7..4a2c28e95 100644 --- a/src/states_screens/dialogs/race_over_dialog.cpp +++ b/src/states_screens/dialogs/race_over_dialog.cpp @@ -72,7 +72,7 @@ RaceOverDialog::RaceOverDialog(const float percentWidth, const float percentHeig // make things more compact if we're missing space while (lines_from_y + (int)num_karts*line_h > buttons_y_from) // cheap way to avoid calculating the required size with proper maths { - line_h *= 0.9; + line_h = (int)(line_h*0.9f); } int kart_id = 0; // 'i' below is not reliable because some karts (e.g. leader) will be skipped diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp index 98ee5f54f..6b053ab9b 100644 --- a/src/utils/string_utils.cpp +++ b/src/utils/string_utils.cpp @@ -151,6 +151,7 @@ namespace StringUtils } catch (std::exception& e) { + (void)e; // avoid warning message about unused variable fprintf(stderr, "Fatal error in split(std::string) : %s @ line %i\n", __FILE__, __LINE__); printf("Splitting %s\n", s.c_str()); @@ -198,6 +199,7 @@ namespace StringUtils } catch (std::exception& e) { + (void)e; // avoid warning about unused variable fprintf(stderr, "Fatal error in split(stringw) : %s @ line %i\n", __FILE__, __LINE__); exit(1); } @@ -251,6 +253,7 @@ namespace StringUtils } catch (std::exception& e) { + (void)e; // avoid warning about unused variable fprintf(stderr, "Fatal error in splitPath : %s @ line %i\n", __FILE__, __LINE__); exit(1); } @@ -286,6 +289,7 @@ namespace StringUtils } catch (std::exception& e) { + (void)e; // avoid warning about unused variable fprintf(stderr,"Fatal error in insertValues(std::string) : %s @ line %i\n", __FILE__, __LINE__); exit(1); } @@ -320,6 +324,7 @@ namespace StringUtils } catch (std::exception& e) { + (void)e; // avoid warning about unused variable fprintf(stderr,"Fatal error in insertValues(stringw) : %s @ line %i\n", __FILE__, __LINE__); exit(1); }