From: <hik...@us...> - 2008-09-21 15:33:19
|
Revision: 2290 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=2290&view=rev Author: hikerstk Date: 2008-09-21 15:33:12 +0000 (Sun, 21 Sep 2008) Log Message: ----------- 1) Fixed compilation problems with VS ('or' instead of || etc) 2) Added new files to VS project. Modified Paths: -------------- trunk/supertuxkart/src/ide/vc9/supertuxkart.vcproj trunk/supertuxkart/src/world.cpp trunk/supertuxkart/src/world.hpp Modified: trunk/supertuxkart/src/ide/vc9/supertuxkart.vcproj =================================================================== --- trunk/supertuxkart/src/ide/vc9/supertuxkart.vcproj 2008-09-21 06:39:18 UTC (rev 2289) +++ trunk/supertuxkart/src/ide/vc9/supertuxkart.vcproj 2008-09-21 15:33:12 UTC (rev 2290) @@ -1135,6 +1135,18 @@ > </File> </Filter> + <Filter + Name="modes" + > + <File + RelativePath="..\..\modes\follow_the_leader.cpp" + > + </File> + <File + RelativePath="..\..\modes\standard_race.cpp" + > + </File> + </Filter> </Filter> <Filter Name="Headerdateien" @@ -1705,6 +1717,18 @@ > </File> </Filter> + <Filter + Name="modes" + > + <File + RelativePath="..\..\modes\follow_the_leader.hpp" + > + </File> + <File + RelativePath="..\..\modes\standard_race.hpp" + > + </File> + </Filter> </Filter> <Filter Name="Ressourcendateien" Modified: trunk/supertuxkart/src/world.cpp =================================================================== --- trunk/supertuxkart/src/world.cpp 2008-09-21 06:39:18 UTC (rev 2289) +++ trunk/supertuxkart/src/world.cpp 2008-09-21 15:33:12 UTC (rev 2290) @@ -94,7 +94,7 @@ //----------------------------------------------------------------------------- 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) { Modified: trunk/supertuxkart/src/world.hpp =================================================================== --- trunk/supertuxkart/src/world.hpp 2008-09-21 06:39:18 UTC (rev 2289) +++ trunk/supertuxkart/src/world.hpp 2008-09-21 15:33:12 UTC (rev 2290) @@ -270,8 +270,8 @@ * 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); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |