From 5501e390def9088ad50e61d36a11244c3e8f6326 Mon Sep 17 00:00:00 2001 From: Flugente Date: Fri, 2 Mar 2018 22:47:54 +0000 Subject: [PATCH] Fix: math functions on VS2010 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8532 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Handle Items.cpp | 2 +- Tactical/Soldier Control.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index 48262e284..6ccc74c76 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -9879,7 +9879,7 @@ void TakePhoto(SOLDIERTYPE* pSoldier, INT32 sGridNo, INT8 bLevel ) for ( int x = -radius; x < radius; ++x ) { - int diff = sqrt( radius*radius - x*x ); + int diff = sqrt( (FLOAT)(radius*radius - x*x) ); for ( int y = -diff; y < diff; ++y ) { diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 4762bc8fb..9f1426729 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -19959,7 +19959,7 @@ FLOAT SOLDIERTYPE::GetIntelGain() UINT32 ubLocationModifier = 1 + max(2, min(20, gCoolnessBySector[SECTOR( this->sSectorX, this->sSectorY )] ) ); // in order not to make the differences to great, alter these values - will now be in [0.6; 4.63] - FLOAT sectorvalue = log( ubLocationModifier ); + FLOAT sectorvalue = log( (FLOAT)ubLocationModifier ); sectorvalue *= sectorvalue / 2.0f; FLOAT totalvalue = personalvalue * sectorvalue;