From 2d237092b7de1982e8c6dbb8f30057d698929920 Mon Sep 17 00:00:00 2001 From: pouillot Date: Fri, 11 Mar 2011 16:36:38 +0000 Subject: [PATCH] Re #307 : Fixed MSVC warnings about suspicious number conversions git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3440 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 86adefc7871f08cdf27c6b9049575720970ffd8f Former-commit-id: abd6e52fa0d089beec7e3bf2a25f8fd9b8c92bab --- src/libs/raceengine/raceinit.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libs/raceengine/raceinit.cpp b/src/libs/raceengine/raceinit.cpp index 41a5aec8..da097348 100644 --- a/src/libs/raceengine/raceinit.cpp +++ b/src/libs/raceengine/raceinit.cpp @@ -194,7 +194,7 @@ ReRaceConfigure(bool bInteractive) ReInfo->mainParams = ReInfo->params = PReRace->getManager()->getDescriptorHandle(); GfParmRemoveVariable (ReInfo->params, "/", "humanInGroup"); - GfParmSetVariable (ReInfo->params, "/", "humanInGroup", ReHumanInGroup() ? 1 : 0); + GfParmSetVariable (ReInfo->params, "/", "humanInGroup", ReHumanInGroup() ? 1.0f : 0.0f); // Enter CONFIG state if interactive mode. if (bInteractive) @@ -211,7 +211,7 @@ ReRaceRestore(void* hparmResults) ReInfo->_reRaceName = PReRace->getSessionName().c_str(); //ReInfo->_reName; GfParmRemoveVariable (ReInfo->params, "/", "humanInGroup"); - GfParmSetVariable (ReInfo->params, "/", "humanInGroup", ReHumanInGroup() ? 1 : 0); + GfParmSetVariable (ReInfo->params, "/", "humanInGroup", ReHumanInGroup() ? 1.0f : 0.0f); } // Start a new race for the previously configured race manager @@ -299,10 +299,10 @@ initStartingGrid(void) a = 0; b = ReInfo->track->width; } - wi2 = ReInfo->track->width * 0.5; + wi2 = ReInfo->track->width * 0.5f; rows = (int)GfParmGetNum(params, path, RM_ATTR_ROWS, (char*)NULL, 2); - rows = (int)GfParmGetNum(trHdle, RM_SECT_STARTINGGRID, RM_ATTR_ROWS, (char*)NULL, rows); + rows = (int)GfParmGetNum(trHdle, RM_SECT_STARTINGGRID, RM_ATTR_ROWS, (char*)NULL, (tdble)rows); d1 = GfParmGetNum(params, path, RM_ATTR_TOSTART, (char*)NULL, 10); d1 = GfParmGetNum(trHdle, RM_SECT_STARTINGGRID, RM_ATTR_TOSTART, (char*)NULL, d1); d2 = GfParmGetNum(params, path, RM_ATTR_COLDIST, (char*)NULL, 10); @@ -310,7 +310,7 @@ initStartingGrid(void) d3 = GfParmGetNum(params, path, RM_ATTR_COLOFFSET, (char*)NULL, 5); d3 = GfParmGetNum(trHdle, RM_SECT_STARTINGGRID, RM_ATTR_COLOFFSET, (char*)NULL, d3); speedInit = GfParmGetNum(params, path, RM_ATTR_INITSPEED, (char*)NULL, 0.0); - heightInit = GfParmGetNum(params, path, RM_ATTR_INITHEIGHT, (char*)NULL, 0.3); + heightInit = GfParmGetNum(params, path, RM_ATTR_INITHEIGHT, (char*)NULL, 0.3f); heightInit = GfParmGetNum(trHdle, RM_SECT_STARTINGGRID, RM_ATTR_INITHEIGHT, (char*)NULL, heightInit); if (rows < 1) { @@ -422,11 +422,11 @@ initPits(void) // captured a bit too easy or too hard. if (pit->freeCarIndex == 0) { pit->pitCarIndex = TR_PIT_STATE_FREE; - pit->lmin = pit->pos.seg->lgfromstart + pit->pos.toStart - pits->len / 2.0 + car->_dimension_x / 2.0; + pit->lmin = pit->pos.seg->lgfromstart + pit->pos.toStart - pits->len / 2.0f + car->_dimension_x / 2.0f; if (pit->lmin > ReInfo->track->length) { pit->lmin -= ReInfo->track->length; } - pit->lmax = pit->pos.seg->lgfromstart + pit->pos.toStart + pits->len / 2.0 - car->_dimension_x / 2.0; + pit->lmax = pit->pos.seg->lgfromstart + pit->pos.toStart + pits->len / 2.0f - car->_dimension_x / 2.0f; if (pit->lmax > ReInfo->track->length) { pit->lmax -= ReInfo->track->length; }