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
This commit is contained in:
parent
3efcb92b74
commit
86743991ae
@ -815,6 +815,10 @@
|
|||||||
RelativePath="..\..\states_screens\dialogs\press_a_key_dialog.cpp"
|
RelativePath="..\..\states_screens\dialogs\press_a_key_dialog.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\states_screens\dialogs\race_over_dialog.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\states_screens\dialogs\track_info_dialog.cpp"
|
RelativePath="..\..\states_screens\dialogs\track_info_dialog.cpp"
|
||||||
>
|
>
|
||||||
@ -1529,6 +1533,10 @@
|
|||||||
RelativePath="..\..\states_screens\dialogs\press_a_key_dialog.hpp"
|
RelativePath="..\..\states_screens\dialogs\press_a_key_dialog.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\states_screens\dialogs\race_over_dialog.hpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\states_screens\dialogs\track_info_dialog.hpp"
|
RelativePath="..\..\states_screens\dialogs\track_info_dialog.hpp"
|
||||||
>
|
>
|
||||||
|
@ -236,7 +236,7 @@ public:
|
|||||||
int getPositionScore(int p) const { return m_score_for_position[p-1]; }
|
int getPositionScore(int p) const { return m_score_for_position[p-1]; }
|
||||||
bool allPlayerFinished() const {return
|
bool allPlayerFinished() const {return
|
||||||
m_num_finished_players==m_player_karts.size();}
|
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<std::string>&
|
const std::vector<std::string>&
|
||||||
getRandomKartList() const { return m_random_kart_list; }
|
getRandomKartList() const { return m_random_kart_list; }
|
||||||
void setRandomKartList(const std::vector<std::string>& rkl)
|
void setRandomKartList(const std::vector<std::string>& rkl)
|
||||||
|
@ -72,7 +72,7 @@ RaceOverDialog::RaceOverDialog(const float percentWidth, const float percentHeig
|
|||||||
// make things more compact if we're missing space
|
// 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
|
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
|
int kart_id = 0; // 'i' below is not reliable because some karts (e.g. leader) will be skipped
|
||||||
|
@ -151,6 +151,7 @@ namespace StringUtils
|
|||||||
}
|
}
|
||||||
catch (std::exception& e)
|
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__);
|
fprintf(stderr, "Fatal error in split(std::string) : %s @ line %i\n", __FILE__, __LINE__);
|
||||||
printf("Splitting %s\n", s.c_str());
|
printf("Splitting %s\n", s.c_str());
|
||||||
|
|
||||||
@ -198,6 +199,7 @@ namespace StringUtils
|
|||||||
}
|
}
|
||||||
catch (std::exception& e)
|
catch (std::exception& e)
|
||||||
{
|
{
|
||||||
|
(void)e; // avoid warning about unused variable
|
||||||
fprintf(stderr, "Fatal error in split(stringw) : %s @ line %i\n", __FILE__, __LINE__);
|
fprintf(stderr, "Fatal error in split(stringw) : %s @ line %i\n", __FILE__, __LINE__);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
@ -251,6 +253,7 @@ namespace StringUtils
|
|||||||
}
|
}
|
||||||
catch (std::exception& e)
|
catch (std::exception& e)
|
||||||
{
|
{
|
||||||
|
(void)e; // avoid warning about unused variable
|
||||||
fprintf(stderr, "Fatal error in splitPath : %s @ line %i\n", __FILE__, __LINE__);
|
fprintf(stderr, "Fatal error in splitPath : %s @ line %i\n", __FILE__, __LINE__);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
@ -286,6 +289,7 @@ namespace StringUtils
|
|||||||
}
|
}
|
||||||
catch (std::exception& e)
|
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__);
|
fprintf(stderr,"Fatal error in insertValues(std::string) : %s @ line %i\n", __FILE__, __LINE__);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
@ -320,6 +324,7 @@ namespace StringUtils
|
|||||||
}
|
}
|
||||||
catch (std::exception& e)
|
catch (std::exception& e)
|
||||||
{
|
{
|
||||||
|
(void)e; // avoid warning about unused variable
|
||||||
fprintf(stderr,"Fatal error in insertValues(stringw) : %s @ line %i\n", __FILE__, __LINE__);
|
fprintf(stderr,"Fatal error in insertValues(stringw) : %s @ line %i\n", __FILE__, __LINE__);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user