From 5be9729872adc334618eddbf37752e06c239804c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 29 Sep 2010 07:25:14 +0000 Subject: [PATCH] - FScanner::Float is a double so there's no need to cast values to float before assigning them to this variable. SVN r2865 (trunk) --- src/am_map.cpp | 12 ------------ src/sc_man.cpp | 6 +++--- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/am_map.cpp b/src/am_map.cpp index 73a7f8c98..45cb3f980 100644 --- a/src/am_map.cpp +++ b/src/am_map.cpp @@ -868,18 +868,6 @@ void AM_initVariables () old_m_h = m_h; } -/* -static void GetComponents (int color, DWORD *palette, float &r, float &g, float &b) -{ - if (palette) - color = palette[color]; - - r = (float)RPART(color); - g = (float)GPART(color); - b = (float)BPART(color); -} -*/ - //============================================================================= // // diff --git a/src/sc_man.cpp b/src/sc_man.cpp index a725c2703..3860105dd 100644 --- a/src/sc_man.cpp +++ b/src/sc_man.cpp @@ -606,7 +606,7 @@ bool FScanner::GetNumber () ScriptError ("SC_GetNumber: Bad numeric constant \"%s\".", String); } } - Float = (float)Number; + Float = Number; return true; } else @@ -662,7 +662,7 @@ bool FScanner::CheckNumber () return false; } } - Float = (float)Number; + Float = Number; return true; } else @@ -719,7 +719,7 @@ bool FScanner::GetFloat () CheckOpen (); if (GetString()) { - Float = (float)strtod (String, &stopper); + Float = strtod (String, &stopper); if (*stopper != 0) { ScriptError ("SC_GetFloat: Bad numeric constant \"%s\".", String);