1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation errors in VS 2005: std::sqrt() -> sqrt()

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2016-11-02 13:24:17 +00:00
parent 3c836ba191
commit 6c737fefd3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/strategicmap.cpp
+2 -2
View File
@@ -5344,7 +5344,7 @@ FLOAT GetSAMMaxDistanceToCoveredSector( UINT8 usSam )
{ {
if ( ubSAMControlledSectors[y][x] & (1 << usSam) ) if ( ubSAMControlledSectors[y][x] & (1 << usSam) )
{ {
FLOAT dist = std::sqrt( FLOAT((sam_x - x)*(sam_x - x) + (sam_y - y)*(sam_y - y)) ); FLOAT dist = sqrt( FLOAT((sam_x - x)*(sam_x - x) + (sam_y - y)*(sam_y - y)) );
if ( maxdist < dist ) if ( maxdist < dist )
maxdist = dist; maxdist = dist;
@@ -5375,7 +5375,7 @@ BOOLEAN DoesSamCoverSector( UINT8 usSam, UINT8 usSector, BOOLEAN* apSamIsWorking
*apSamIsWorking = TRUE; *apSamIsWorking = TRUE;
} }
FLOAT dist = std::sqrt( FLOAT((SECTORX( samsector ) - SECTORX( usSector ))*(SECTORX( samsector ) - SECTORX( usSector )) + (SECTORY( samsector ) - SECTORY( usSector ))*(SECTORY( samsector ) - SECTORY( usSector ))) ); FLOAT dist = sqrt( FLOAT((SECTORX( samsector ) - SECTORX( usSector ))*(SECTORX( samsector ) - SECTORX( usSector )) + (SECTORY( samsector ) - SECTORY( usSector ))*(SECTORY( samsector ) - SECTORY( usSector ))) );
// determine max distance SAM has to cover // determine max distance SAM has to cover
FLOAT sammaxdistance = GetSAMMaxDistanceToCoveredSector( usSam ); FLOAT sammaxdistance = GetSAMMaxDistanceToCoveredSector( usSam );
Tactical/Interface Control.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#else #else
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#include <math.h>
#include "sgp.h" #include "sgp.h"
#include "gameloop.h" #include "gameloop.h"
#include "himage.h" #include "himage.h"
@@ -636,7 +637,7 @@ void DrawExplosionWarning( INT32 sGridno, INT8 usLevel, INT8 usDelay )
{ {
for ( INT32 y = yl; y <= yh; ++y ) for ( INT32 y = yl; y <= yh; ++y )
{ {
FLOAT diff = std::sqrt( (FLOAT)((sScreenX - x) * (sScreenX - x) + 2 * (sScreenY - y) * (sScreenY - y)) ); FLOAT diff = sqrt( (FLOAT)((sScreenX - x) * (sScreenX - x) + 2 * (sScreenY - y) * (sScreenY - y)) );
if ( radius_inner <= diff && diff <= radius_outer ) if ( radius_inner <= diff && diff <= radius_outer )
{ {