From 835e948735467d079645687f30aec79263a0d235 Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 22 Aug 2016 19:24:14 +0000 Subject: [PATCH] Fixed compilation errors in VS 2005: std::sqrt() -> sqrt() git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8291 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Ja25Update.cpp | 2 +- Tactical/LOS.cpp | 6 +++--- Tactical/Soldier Find.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Ja25Update.cpp b/Ja25Update.cpp index 6599a7e65..80edcd642 100644 --- a/Ja25Update.cpp +++ b/Ja25Update.cpp @@ -98,4 +98,4 @@ typedef struct #endif -//****************************************************************************** +//****************************************************************************** diff --git a/Tactical/LOS.cpp b/Tactical/LOS.cpp index c0180c268..9dcb41b5d 100644 --- a/Tactical/LOS.cpp +++ b/Tactical/LOS.cpp @@ -2811,19 +2811,19 @@ BOOLEAN BulletHitMerc( BULLET * pBullet, STRUCTURE * pStructure, BOOLEAN fIntend FLOAT bodycenterX = (FLOAT)CenterX( pTarget->sGridNo ); FLOAT bodycenterY = (FLOAT)CenterY( pTarget->sGridNo ); - FLOAT difftobodycenter = std::sqrt( (bodycenterX - x) * (bodycenterX - x) + (bodycenterY - y) * (bodycenterY - y) ); + FLOAT difftobodycenter = sqrt( (bodycenterX - x) * (bodycenterX - x) + (bodycenterY - y) * (bodycenterY - y) ); INT32 viewdirectiongridno = NewGridNo( pTarget->sGridNo, DirectionInc( pTarget->ubDirection ) ); FLOAT nextgridnocenterX = (FLOAT)CenterX( viewdirectiongridno ); FLOAT nextgridnocenterY = (FLOAT)CenterY( viewdirectiongridno ); - FLOAT difftonextgridno = std::sqrt( (nextgridnocenterX - x) * (nextgridnocenterX - x) + (nextgridnocenterY - y) * (nextgridnocenterY - y) ); + FLOAT difftonextgridno = sqrt( (nextgridnocenterX - x) * (nextgridnocenterX - x) + (nextgridnocenterY - y) * (nextgridnocenterY - y) ); INT32 oppositeviewdirectiongridno = NewGridNo( pTarget->sGridNo, DirectionInc( gOppositeDirection[pTarget->ubDirection] ) ); FLOAT oppositenextgridnocenterX = (FLOAT)CenterX( oppositeviewdirectiongridno ); FLOAT oppositenextgridnocenterY = (FLOAT)CenterY( oppositeviewdirectiongridno ); - FLOAT difftooppositenextgridno = std::sqrt( (oppositenextgridnocenterX - x) * (oppositenextgridnocenterX - x) + (oppositenextgridnocenterY - y) * (oppositenextgridnocenterY - y) ); + FLOAT difftooppositenextgridno = sqrt( (oppositenextgridnocenterX - x) * (oppositenextgridnocenterX - x) + (oppositenextgridnocenterY - y) * (oppositenextgridnocenterY - y) ); if ( difftobodycenter < difftonextgridno ) { diff --git a/Tactical/Soldier Find.cpp b/Tactical/Soldier Find.cpp index f6471a0bc..3d3a699ef 100644 --- a/Tactical/Soldier Find.cpp +++ b/Tactical/Soldier Find.cpp @@ -966,19 +966,19 @@ BOOLEAN FindRelativeSoldierPosition( SOLDIERTYPE *pSoldier, UINT16 *usFlags, INT FLOAT bodycenterX = (FLOAT)CenterX( pSoldier->sGridNo ); FLOAT bodycenterY = (FLOAT)CenterY( pSoldier->sGridNo ); - FLOAT difftobodycenter = std::sqrt( (bodycenterX - sWorldX) * (bodycenterX - sWorldX) + (bodycenterY - sWorldY) * (bodycenterY - sWorldY) ); + FLOAT difftobodycenter = sqrt( (bodycenterX - sWorldX) * (bodycenterX - sWorldX) + (bodycenterY - sWorldY) * (bodycenterY - sWorldY) ); INT32 viewdirectiongridno = NewGridNo( pSoldier->sGridNo, DirectionInc( pSoldier->ubDirection ) ); FLOAT nextgridnocenterX = (FLOAT)CenterX( viewdirectiongridno ); FLOAT nextgridnocenterY = (FLOAT)CenterY( viewdirectiongridno ); - FLOAT difftonextgridno = std::sqrt( (nextgridnocenterX - sWorldX) * (nextgridnocenterX - sWorldX) + (nextgridnocenterY - sWorldY) * (nextgridnocenterY - sWorldY) ); + FLOAT difftonextgridno = sqrt( (nextgridnocenterX - sWorldX) * (nextgridnocenterX - sWorldX) + (nextgridnocenterY - sWorldY) * (nextgridnocenterY - sWorldY) ); INT32 oppositeviewdirectiongridno = NewGridNo( pSoldier->sGridNo, DirectionInc( gOppositeDirection[pSoldier->ubDirection] ) ); FLOAT oppositenextgridnocenterX = (FLOAT)CenterX( oppositeviewdirectiongridno ); FLOAT oppositenextgridnocenterY = (FLOAT)CenterY( oppositeviewdirectiongridno ); - FLOAT difftooppositenextgridno = std::sqrt( (oppositenextgridnocenterX - sWorldX) * (oppositenextgridnocenterX - sWorldX) + (oppositenextgridnocenterY - sWorldY) * (oppositenextgridnocenterY - sWorldY) ); + FLOAT difftooppositenextgridno = sqrt( (oppositenextgridnocenterX - sWorldX) * (oppositenextgridnocenterX - sWorldX) + (oppositenextgridnocenterY - sWorldY) * (oppositenextgridnocenterY - sWorldY) ); if ( difftobodycenter < difftonextgridno ) {