speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans">

Browse source 
<p>Fixed GCC 4.2 warnings in grcar.cpp</p>
</body></html>


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@686 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: afec93461731ecd6178b9b1aea90f973f5824ee6
Former-commit-id: cfd3f36fd9cea5b549ccdfd39347123a7d441ba5
This commit is contained in:
pouillot 2009-01-27 22:39:30 +00:00
parent 2fe7f133b9
commit 71a96e7346
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/modules/graphic/ssggraph/grcar.cpp
View file

@ -107,7 +107,7 @@ initWheel(tCarElt *car, int wheel_index, const char *wheel_mod_name)
float b_offset = 0;
tdble curAngle = 0.0;
static const unsigned brakeBranch = 16;
static const int brakeBranch = 16;
static const tdble brakeAngle = 2.0 * M_PI / (tdble)brakeBranch;
static const tdble brakeOffset = 0.1;
@ -302,14 +302,14 @@ initWheel(tCarElt *car, int wheel_index, const char *wheel_mod_name)
// If we don't have a 3D wheel, use auto-generated wheel...
} else {
static const unsigned wheelBranch = 16;
static const int wheelBranch = 16;
static const sgVec2 toffset[4] =
{ { 0.0, 0.5 }, { 0.5, 0.5 }, { 0.0, 0.0 }, { 0.5, 0.0 } };
/* Try and load rim texture if not already done */
if (!grCarInfo[grCarIndex].wheelTexture) {
char *wheelTexFName =
GfParmGetStrNC(car->_carHandle, SECT_GROBJECTS, PRM_WHEEL_TEXTURE, "tex-wheel.png");
const char *wheelTexFName =
GfParmGetStr(car->_carHandle, SECT_GROBJECTS, PRM_WHEEL_TEXTURE, "tex-wheel.png");
grCarInfo[grCarIndex].wheelTexture = grSsgLoadTexState(wheelTexFName);
/*if (grCarInfo[grCarIndex].wheelTexture->getRef() > 0)
grCarInfo[grCarIndex].wheelTexture->deRef();*/
@ -951,8 +951,6 @@ grDrawCar(tSituation *s, tCarElt *car, tCarElt *curCar, int dispCarFlag, int dis
grCarInfo[index].DRMThreshold[i] >= car->_steerCmd &&
grCarInfo[index].DRMThreshold[i] <= curSteer))
{
float fsteer = fabs(car->_steerCmd);
curDRM = i;
curSteer = grCarInfo[index].DRMThreshold[i];
}