Revision: 2413
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2413&view=rev
Author: rorthomas
Date: 2012-01-31 15:42:47 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
fixes #923
Modified Paths:
--------------
trunk/source/main/framework/AppStateManager.cpp
trunk/source/main/physics/Beam.cpp
Modified: trunk/source/main/framework/AppStateManager.cpp
===================================================================
--- trunk/source/main/framework/AppStateManager.cpp 2012-01-31 15:36:07 UTC
(rev 2412)
+++ trunk/source/main/framework/AppStateManager.cpp 2012-01-31 15:42:47 UTC
(rev 2413)
@@ -131,7 +131,11 @@
if (maxFPS && timeSinceLastFrame < minTimePerFrame)
{
// Sleep twice as long as we were too fast.
+#ifdef WIN32
Sleep((minTimePerFrame - timeSinceLastFrame) << 1);
+#else
+ sleep((minTimePerFrame - timeSinceLastFrame) << 1);
+#endif // WIN32
}
update(timeSinceLastFrame);
Modified: trunk/source/main/physics/Beam.cpp
===================================================================
--- trunk/source/main/physics/Beam.cpp 2012-01-31 15:36:07 UTC (rev 2412)
+++ trunk/source/main/physics/Beam.cpp 2012-01-31 15:42:47 UTC (rev 2413)
@@ -5477,7 +5477,7 @@
// accelerate / brake
float maxvelo = 1;
- maxvelo = std::max(0.2f, 1-fabs(mYaw)) * 50;
+ maxvelo = std::max<float>(0.2f, 1-fabs(mYaw)) * 50;
if(engine)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
