From 41d7f4019342215270775385779c926d4969e33a Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sun, 28 Apr 2013 11:12:04 +1000 Subject: [PATCH] add some casts so gcc can pick an overloaded abs/max/min func --- CODE-mp/client/FxScheduler.cpp | 4 ++-- CODE-mp/client/cl_cin.cpp | 2 +- CODE-mp/client/cl_input.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CODE-mp/client/FxScheduler.cpp b/CODE-mp/client/FxScheduler.cpp index 9cdc93c..1544752 100644 --- a/CODE-mp/client/FxScheduler.cpp +++ b/CODE-mp/client/FxScheduler.cpp @@ -1134,7 +1134,7 @@ void CFxScheduler::PlayEffect( int id, CFxBoltInterface *obj ) if ( prim->mSpawnFlags & FX_EVEN_DISTRIBUTION ) { - factor = abs(prim->mSpawnDelay.GetMax() - prim->mSpawnDelay.GetMin()) / (float)count; + factor = abs((long)(prim->mSpawnDelay.GetMax() - prim->mSpawnDelay.GetMin())) / (float)count; } // Schedule the random number of bits @@ -1642,7 +1642,7 @@ void CFxScheduler::PlayEffect( int id, vec3_t origin, vec3_t axis[3], const int if ( prim->mSpawnFlags & FX_EVEN_DISTRIBUTION ) { - factor = abs(prim->mSpawnDelay.GetMax() - prim->mSpawnDelay.GetMin()) / (float)count; + factor = abs((long)(prim->mSpawnDelay.GetMax() - prim->mSpawnDelay.GetMin())) / (float)count; } // Schedule the random number of bits diff --git a/CODE-mp/client/cl_cin.cpp b/CODE-mp/client/cl_cin.cpp index 3d22399..0e8b964 100644 --- a/CODE-mp/client/cl_cin.cpp +++ b/CODE-mp/client/cl_cin.cpp @@ -1189,7 +1189,7 @@ e_status CIN_RunCinematic (int handle) } thisTime = Sys_Milliseconds()*com_timescale->value; - if (cinTable[currentHandle].shader && (abs(thisTime - cinTable[currentHandle].lastTime))>100) { + if (cinTable[currentHandle].shader && (abs((long)(thisTime - cinTable[currentHandle].lastTime)))>100) { cinTable[currentHandle].startTime += thisTime - cinTable[currentHandle].lastTime; } cinTable[currentHandle].tfps = ((((Sys_Milliseconds()*com_timescale->value) - cinTable[currentHandle].startTime)*cinTable[currentHandle].roqFPS)/1000); diff --git a/CODE-mp/client/cl_input.cpp b/CODE-mp/client/cl_input.cpp index 9334077..fed7499 100644 --- a/CODE-mp/client/cl_input.cpp +++ b/CODE-mp/client/cl_input.cpp @@ -741,10 +741,10 @@ usercmd_t CL_CreateCmd( void ) { // draw debug graphs of turning for mouse testing if ( cl_debugMove->integer ) { if ( cl_debugMove->integer == 1 ) { - SCR_DebugGraph( abs(cl.viewangles[YAW] - oldAngles[YAW]), 0 ); + SCR_DebugGraph( abs((long)(cl.viewangles[YAW] - oldAngles[YAW])), 0 ); } if ( cl_debugMove->integer == 2 ) { - SCR_DebugGraph( abs(cl.viewangles[PITCH] - oldAngles[PITCH]), 0 ); + SCR_DebugGraph( abs((long)(cl.viewangles[PITCH] - oldAngles[PITCH])), 0 ); } }