ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-solved several VS/linux compilation errors, and updated VS project file.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2294 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2008-09-22 12:14:55 +00:00
parent 199681c1d2
commit cfb755ac9e
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/race_gui.hpp
View File

@@ -66,8 +66,8 @@ class RaceGUI: public BaseGUI
m_red=red; m_blue=blue; m_green=green;
}
// in follow leader the clock counts backwards
bool done() const { const int time = RaceManager::getWorld()->getTime(); // work around gcc bug (doesn't accept :: in a ?)
return m_end_time<0 ||
bool done() const { const int time = (int)RaceManager::getWorld()->getTime(); // work around gcc bug (doesn't accept :: in a ?)
return m_end_time<0.0f ||
(race_manager->getMinorMode()==RaceManager::MINOR_MODE_FOLLOW_LEADER ?
time<m_end_time : time>m_end_time); }
};

24
src/ide/vc9/supertuxkart.vcproj
View File

@@ -895,10 +895,6 @@
RelativePath="..\..\vec3.cpp"
>
</File>
<File
RelativePath="../../../src\world.cpp"
>
</File>
<Filter
Name="gui"
>
@@ -1138,6 +1134,10 @@
<Filter
Name="modes"
>
<File
RelativePath="..\..\modes\clock.cpp"
>
</File>
<File
RelativePath="..\..\modes\follow_the_leader.cpp"
>
@@ -1146,6 +1146,10 @@
RelativePath="..\..\modes\standard_race.cpp"
>
</File>
<File
RelativePath="..\..\modes\world.cpp"
>
</File>
</Filter>
</Filter>
<Filter
@@ -1433,10 +1437,6 @@
RelativePath="..\..\vec3.hpp"
>
</File>
<File
RelativePath="../../../src\world.hpp"
>
</File>
<Filter
Name="gui"
>
@@ -1720,6 +1720,10 @@
<Filter
Name="modes"
>
<File
RelativePath="..\..\modes\clock.hpp"
>
</File>
<File
RelativePath="..\..\modes\follow_the_leader.hpp"
>
@@ -1728,6 +1732,10 @@
RelativePath="..\..\modes\standard_race.hpp"
>
</File>
<File
RelativePath="..\..\modes\world.hpp"
>
</File>
</Filter>
</Filter>
<Filter

2
src/modes/clock.cpp
View File

@@ -61,7 +61,7 @@ void Clock::setMode(const ClockType mode, const float initial_time)
//-----------------------------------------------------------------------------
void Clock::raceOver(const bool delay)
{
if(m_phase == DELAY_FINISH_PHASE or m_phase == FINISH_PHASE) return; // we already know
if(m_phase == DELAY_FINISH_PHASE || m_phase == FINISH_PHASE) return; // we already know
if(delay)
{

7
src/modes/world.hpp
View File

@@ -78,8 +78,9 @@ class SFXBase;
class World
{
protected:
public:
typedef std::vector<Kart*> Karts;
protected:
std::vector<PlayerKart*> m_player_karts;
std::vector<PlayerKart*> m_local_player_karts;
@@ -170,8 +171,8 @@ public:
* The code that draws the timer should call this first to know
* whether the game mode wants a timer drawn
*/
bool shouldDrawTimer() const { return ((m_clock.getPhase() == RACE_PHASE or
m_clock.getPhase() == DELAY_FINISH_PHASE) and
bool shouldDrawTimer() const { return ((m_clock.getPhase() == RACE_PHASE ||
m_clock.getPhase() == DELAY_FINISH_PHASE) &&
m_clock.getMode() != CLOCK_NONE); }