Changeset 849

Timestamp:

02/04/10 15:17:57 (7 months ago)

Author:

ryan

Message:

Eliminate precision ambiguity

Location:

trunk/engine

Files:

• MainCharacter/MainCharacter.cpp (modified) (3 diffs)
• VideoServices/3DViewport.cpp (modified) (1 diff)

trunk/engine/MainCharacter/MainCharacter.cpp

@@ -280 +280 @@
     }
     // if mGameOpts now outlaw basic craft, we must update
-    while(!(lReturnValue->mGameOpts & ((int) pow(2, 3 - ((lReturnValue->mHoverModel + 4) % 4)))))
+    while(!(lReturnValue->mGameOpts & ((int) pow(2.0f, 3.0f - ((lReturnValue->mHoverModel + 4) % 4)))))
         lReturnValue->mHoverModel++;
 
@@ -406 +406 @@
                 
                 // ensure we are using an allowed craft
-                while(!(mGameOpts & ((int) pow(2, 3 - ((mHoverModel + 4) % 4)))))
+                while(!(mGameOpts & ((int) pow(2.0f, 3.0f - ((mHoverModel + 4) % 4)))))
                     mHoverModel++;
             }
@@ -414 +414 @@
 
                 // ensure we are using an allowed craft
-                while(!(mGameOpts & ((int) pow(2, 3 - ((mHoverModel + 4) % 4)))))
+                while(!(mGameOpts & ((int) pow(2.0f, 3.0f - ((mHoverModel + 4) % 4)))))
                     mHoverModel--;
             }

trunk/engine/VideoServices/3DViewport.cpp

@@ -137 +137 @@
             static_cast<MR_Int32>(
                 1024 * MR_BACK_Y_RES * mPlanVW /
-                (sqrt(pow(mPlanDist, 2) + pow((lCounter - mXRes / 2) * mPlanHW / (mXRes / 2), 2)) * (mYRes / 2))
+                (sqrt(pow(mPlanDist, 2.0f) + pow((lCounter - mXRes / 2) * mPlanHW / (mXRes / 2), 2.0f)) * (mYRes / 2))
                 );
     }