Merge pull request #50 from Manuel-K/gcc-6.1.1-fix

fix compilation errors with gcc 6.1.1 on Arch Linux
icculus · May 24, 2016 · 0b24c2f · 0b24c2f
2 parents be4c22f + ba8d82e
commit 0b24c2f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Sources/Entities/Bullet.es b/Sources/Entities/Bullet.es
@@ -344,7 +344,7 @@ functions:
             GetNormalComponent( vDistance/fDistance, vHitNormal, ese.vDirection);
             FLOAT fLength = ese.vDirection.Length();
             fLength   = Clamp( fLength*3, 1.0f, 3.0f);
-            fDistance = Clamp( log10(fDistance), 0.5, 2.0);
+            fDistance = Clamp( log10(fDistance), 0.5f, 2.0f);
             ese.vStretch = FLOAT3D( fDistance, fLength*fDistance, 1.0f);
             SpawnEffect(vHitPoint, ese);
           }
@@ -417,4 +417,4 @@ procedures:
     m_iBullet = 0;
     return;
   };
-};
+};
diff --git a/Sources/Entities/Player.es b/Sources/Entities/Player.es
@@ -4588,7 +4588,7 @@ void TeleportPlayer(enum WorldLinkType EwltType)
     TIME tmLevelTime = _pTimer->CurrentTick()-m_tmLevelStarted;
     m_psLevelStats.ps_tmTime = tmLevelTime;
     m_psGameStats.ps_tmTime += tmLevelTime;
-    FLOAT fTimeDelta = ClampDn(floor(m_tmEstTime)-floor(tmLevelTime), 0.0);
+    FLOAT fTimeDelta = ClampDn(floor(m_tmEstTime)-floor(tmLevelTime), 0.0f);
     m_iTimeScore = floor(fTimeDelta*100.0f);
     m_psLevelStats.ps_iScore+=m_iTimeScore;
     m_psGameStats.ps_iScore+=m_iTimeScore;

diff --git a/Sources/EntitiesMP/Common/Common.cpp b/Sources/EntitiesMP/Common/Common.cpp
@@ -386,7 +386,7 @@ void SpawnHitTypeEffect(CEntity *pen, enum BulletHitType bhtType, BOOL bSound, F
           GetNormalComponent( vDistance/fDistance, vHitNormal, ese.vDirection);
           FLOAT fLength = ese.vDirection.Length();
           fLength   = Clamp( fLength*3, 1.0f, 3.0f);
-          fDistance = Clamp( log10(fDistance), 0.5, 2.0);
+          fDistance = Clamp( log10(fDistance), 0.5f, 2.0f);
           ese.vStretch = FLOAT3D( fDistance, fLength*fDistance, 1.0f);
           try
           {

diff --git a/Sources/EntitiesMP/Player.es b/Sources/EntitiesMP/Player.es
@@ -5381,7 +5381,7 @@ functions:
     TIME tmLevelTime = _pTimer->CurrentTick()-m_tmLevelStarted;
     m_psLevelStats.ps_tmTime = tmLevelTime;
     m_psGameStats.ps_tmTime += tmLevelTime;
-    FLOAT fTimeDelta = ClampDn(floor(m_tmEstTime)-floor(tmLevelTime), 0.0);
+    FLOAT fTimeDelta = ClampDn(floor(m_tmEstTime)-floor(tmLevelTime), 0.0f);
     m_iTimeScore = (INDEX) floor(fTimeDelta*100.0f);
     m_psLevelStats.ps_iScore+=m_iTimeScore;
     m_psGameStats.ps_iScore+=m_iTimeScore;