Changeset 10259 for code/trunk/src

Timestamp:

Feb 6, 2015, 10:55:17 PM (9 years ago)

Author:

landauf

Message:

recorded merge of pickupsFS14 up to r10112 (which was already mostly merged in presentationFS14). updated files to the state of r10112

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/jump/Jump.cc (modified) (1 diff)

code/trunk/src/modules/jump/Jump.cc

@@ -395 +395 @@
     JumpPlatformTimer* Jump::addPlatformTimer(float xPosition, float zPosition, float time, float variance)
     {
-        float additionalTime = (float)(rand()%100)/(100*variance) - variance/2;
+        float additionalTime = (float)(rand()%100)/100.0*variance - variance/2.0;
 
         JumpPlatformTimer* newPlatform = new JumpPlatformTimer(center_->getContext());