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

1) Fixed compilation problems with VS ('or' instead of || etc)

Browse Source 
2) Added new files to VS project.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2290 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2008-09-21 15:33:12 +00:00
parent 5e07085fd1
commit 4f4d328bde
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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"

2
src/world.cpp
View File

@@ -94,7 +94,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)
{

4
src/world.hpp
View File

@@ -270,8 +270,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); }