Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace sqrt(x) with sqrt((double)x) to make broken compilers happy.

master
Cyp 2010-12-09 17:03:23 +01:00
parent 49a85a0307
commit 3f6ecec025
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/framework/math_ext.h
View File

@ -155,7 +155,7 @@ static inline void solveDifferential2ndOrder(float *y_, float *dydt_, float acce
y = complexDouble(*y_, 0);
dydt = complexDouble(*dydt_, 0);
sqd = d > 0? complexDouble(sqrt(d), 0) : complexDouble(0, sqrt(-d)); // sqd = std::sqrt(d);
sqd = d > 0? complexDouble(sqrt((double)d), 0) : complexDouble(0, sqrt((double)-d)); // sqd = std::sqrt(d);
h1 = complexDoubleAdd(complexDouble(-friction/2, 0), sqd); // h1 = -friction/2 + sqd;
h2 = complexDoubleSub(complexDouble(-friction/2, 0), sqd); // h2 = -friction/2 - sqd;
e1 = complexDoubleExp(complexDoubleMul(h1, complexDouble(dt, 0))); // e1 = std::exp(h1*dt);

4
lib/framework/trig.cpp
View File

@ -150,7 +150,7 @@ uint16_t iAtan2(int32_t s, int32_t c)
int32_t iSqrt(uint32_t n)
{
uint32_t r = sqrt(n); // Calculate square root, rounded down. Excess precision does not change the result.
uint32_t r = sqrt((double)n); // Calculate square root, rounded down. Excess precision does not change the result.
// Check that we got the right result.
ASSERT((int32_t)(r*r - n) <= 0 && (int32_t)((r + 1)*(r + 1) - n) > 0, "Too badly broken sqrt function, iSqrt(%u) = %u.", (unsigned)n, (unsigned)r);
@ -163,7 +163,7 @@ int32_t i64Sqrt(uint64_t n)
uint64_t r;
if (sizeof(void *) > 4)
{
r = sqrt(n); // Calculate square root, usually rounded down. Excess precision may result in rounding down instead of up, which is fine.
r = sqrt((double)n); // Calculate square root, usually rounded down. Excess precision may result in rounding down instead of up, which is fine.
}
else
{

4
lib/ivis_common/imdload.cpp
View File

@ -425,7 +425,7 @@ static BOOL _imd_load_points( const char **ppFileData, iIMDShape *s )
dz = dia2.z - cen.z;
rad_sq = dx*dx + dy*dy + dz*dz;
rad = sqrt(rad_sq);
rad = sqrt((double)rad_sq);
// second pass (find tight sphere)
for (p = s->points; p < s->points + s->npoints; p++)
@ -439,7 +439,7 @@ static BOOL _imd_load_points( const char **ppFileData, iIMDShape *s )
if (old_to_p_sq>rad_sq)
{
// this point outside current sphere
old_to_p = sqrt(old_to_p_sq);
old_to_p = sqrt((double)old_to_p_sq);
// radius of new sphere
rad = (rad + old_to_p) / 2.;
// rad**2 for next compare

2
src/main.cpp
View File

@ -1123,7 +1123,7 @@ static bool fptest2(void)
wtf = true;
break;
}
b = 1/sqrt(b - (unsigned)b);
b = 1/sqrt((double)(b - (unsigned)b));
}
for (n = 0; n != 100; ++n)
{

3
src/map.cpp
View File

@ -115,9 +115,6 @@ typedef struct _zonemap_save_header {
// Maximum expected return value from get height
#define MAX_HEIGHT (256 * ELEVATION_SCALE)
/* Number of entries in the sqrt(1/(1+x*x)) table for aaLine */
#define ROOT_TABLE_SIZE 1024
/* The size and contents of the map */
SDWORD mapWidth = 0, mapHeight = 0;
MAPTILE *psMapTiles = NULL;

4
src/terrain.cpp
View File

@ -718,8 +718,8 @@ bool initTerrain(void)
debug(LOG_TERRAIN, "GL_MAX_ELEMENTS_INDICES: %i", (int)GLmaxElementsIndices);
// now we know these values, determine the maximum sector size achievable
maxSectorSizeVertices = sqrt(GLmaxElementsVertices/2)-1;
maxSectorSizeIndices = sqrt(GLmaxElementsIndices/12);
maxSectorSizeVertices = iSqrt(GLmaxElementsVertices/2)-1;
maxSectorSizeIndices = iSqrt(GLmaxElementsIndices/12);
debug(LOG_TERRAIN, "preferred sector size: %i", sectorSize);
debug(LOG_TERRAIN, "maximum sector size due to vertices: %i", maxSectorSizeVertices);