iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Re #307 : Fixed MSVC warnings about suspicious number conversions

Browse source 
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
This commit is contained in:
pouillot 2011-03-11 16:36:38 +00:00
parent 4e0725737a
commit 2d237092b7
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libs/raceengine/raceinit.cpp
View file

@ -194,7 +194,7 @@ ReRaceConfigure(bool bInteractive)
ReInfo->mainParams = ReInfo->params = PReRace->getManager()->getDescriptorHandle(); ReInfo->mainParams = ReInfo->params = PReRace->getManager()->getDescriptorHandle();
GfParmRemoveVariable (ReInfo->params, "/", "humanInGroup"); 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. // Enter CONFIG state if interactive mode.
if (bInteractive) if (bInteractive)
@ -211,7 +211,7 @@ ReRaceRestore(void* hparmResults)
ReInfo->_reRaceName = PReRace->getSessionName().c_str(); //ReInfo->_reName; ReInfo->_reRaceName = PReRace->getSessionName().c_str(); //ReInfo->_reName;
GfParmRemoveVariable (ReInfo->params, "/", "humanInGroup"); 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 // Start a new race for the previously configured race manager
@ -299,10 +299,10 @@ initStartingGrid(void)
a = 0; a = 0;
b = ReInfo->track->width; 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(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(params, path, RM_ATTR_TOSTART, (char*)NULL, 10);
d1 = GfParmGetNum(trHdle, RM_SECT_STARTINGGRID, RM_ATTR_TOSTART, (char*)NULL, d1); d1 = GfParmGetNum(trHdle, RM_SECT_STARTINGGRID, RM_ATTR_TOSTART, (char*)NULL, d1);
d2 = GfParmGetNum(params, path, RM_ATTR_COLDIST, (char*)NULL, 10); 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(params, path, RM_ATTR_COLOFFSET, (char*)NULL, 5);
d3 = GfParmGetNum(trHdle, RM_SECT_STARTINGGRID, RM_ATTR_COLOFFSET, (char*)NULL, d3); d3 = GfParmGetNum(trHdle, RM_SECT_STARTINGGRID, RM_ATTR_COLOFFSET, (char*)NULL, d3);
speedInit = GfParmGetNum(params, path, RM_ATTR_INITSPEED, (char*)NULL, 0.0); 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); heightInit = GfParmGetNum(trHdle, RM_SECT_STARTINGGRID, RM_ATTR_INITHEIGHT, (char*)NULL, heightInit);
if (rows < 1) { if (rows < 1) {
@ -422,11 +422,11 @@ initPits(void)
// captured a bit too easy or too hard. // captured a bit too easy or too hard.
if (pit->freeCarIndex == 0) { if (pit->freeCarIndex == 0) {
pit->pitCarIndex = TR_PIT_STATE_FREE; 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) { if (pit->lmin > ReInfo->track->length) {
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) { if (pit->lmax > ReInfo->track->length) {
pit->lmax -= ReInfo->track->length; pit->lmax -= ReInfo->track->length;
} }