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

fix more clang warnings

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

Former-commit-id: 6d6e1229a80136387a23448f660f81e8fb22f452
Former-commit-id: e60592061873a55ac5cca28877661efab704fd03
This commit is contained in:
iobyte 2022-02-10 14:58:44 +00:00
parent f5666bb03a
commit 61dd0ed443
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/modules/racing/standardgame/racecareer.cpp
View file

@ -78,7 +78,7 @@ typedef struct CareerInfo
static int ReCareerUtilRand( int min, int max ) static int ReCareerUtilRand( int min, int max )
{ {
return min + (int)floor( (double)( max - min + 1 ) * (double)( rand() / ( RAND_MAX + 1.0f ) ) ); return min + (int)floor( (double)( max - min + 1 ) * (double)( rand() / ( (double)RAND_MAX + 1.0 ) ) );
} }
static void ReCareerUtilManipString( char* string, int number, int bufLength ) static void ReCareerUtilManipString( char* string, int number, int bufLength )
@ -196,7 +196,7 @@ static double ReCareerNewSkill( int nbGroups, int groupNb )
double min = 9.0f * (double)(MAX(0, nbGroups - groupNb - 1))/(double)(MAX(1, nbGroups)); double min = 9.0f * (double)(MAX(0, nbGroups - groupNb - 1))/(double)(MAX(1, nbGroups));
double max = MIN( 10.0f, 11.0f * (double)(MAX(1, nbGroups - groupNb))/(double)(MAX(1,nbGroups)) ); double max = MIN( 10.0f, 11.0f * (double)(MAX(1, nbGroups - groupNb))/(double)(MAX(1,nbGroups)) );
return min + (double)( max - min ) * (double)( rand() / ( RAND_MAX + 1.0f ) ); return min + (double)( max - min ) * (double)( rand() / ( (double)RAND_MAX + 1.0) );
} }
static void ReCareerNewAddDrivers( void *curParam, void *curResult, char *humans, int classNb ) static void ReCareerNewAddDrivers( void *curParam, void *curResult, char *humans, int classNb )
@ -960,7 +960,7 @@ static void ReCareerNextWrite( tCareerInfo *info )
GfParmListClean( curParam, RM_SECT_DRIVERINFO ); GfParmListClean( curParam, RM_SECT_DRIVERINFO );
GfParmListClean( curParam, RM_SECT_TRACKS ); GfParmListClean( curParam, RM_SECT_TRACKS );
xx = 0; xx = 0;
while( xx < info->nbClasses && !strcmp( info->classes[ xx ].suffix, GfParmGetStr( curParam, RM_SECT_SUBFILES, RM_ATTR_SUFFIX, "" ) ) == 0 ) { while( xx < info->nbClasses && strcmp( info->classes[ xx ].suffix, GfParmGetStr( curParam, RM_SECT_SUBFILES, RM_ATTR_SUFFIX, "" ) ) != 0 ) {
++xx; ++xx;
} }
if( xx >= info->nbClasses ) { if( xx >= info->nbClasses ) {
@ -1018,7 +1018,7 @@ static void ReCareerNextWrite( tCareerInfo *info )
GfParmReleaseHandle( curParam ); GfParmReleaseHandle( curParam );
curParam = tmp; curParam = tmp;
++curGroup[ xx ]; ++curGroup[ xx ];
} while( !strcmp( GfParmGetFileName( curParam ), firstfile ) == 0 ); } while( strcmp( GfParmGetFileName( curParam ), firstfile ) != 0 );
GfParmReleaseHandle( curParam ); GfParmReleaseHandle( curParam );
free( firstfile ); free( firstfile );

2
src/modules/racing/standardgame/racemain.cpp
View file

@ -1224,7 +1224,7 @@ ReRaceEventShutdown(void)
/* Check if it is free */ /* Check if it is free */
snprintf( buf, sizeof(buf), "%s/%d", RM_SECT_TRACKS, snprintf( buf, sizeof(buf), "%s/%d", RM_SECT_TRACKS,
(int)GfParmGetNum(results, RE_SECT_CURRENT, RE_ATTR_CUR_TRACK, NULL, 1) ); (int)GfParmGetNum(results, RE_SECT_CURRENT, RE_ATTR_CUR_TRACK, NULL, 1) );
if( !strcmp(GfParmGetStr(params, buf, RM_ATTR_NAME, "free"), "free") == 0) { if( strcmp(GfParmGetStr(params, buf, RM_ATTR_NAME, "free"), "free") != 0) {
/* Not a free weekend */ /* Not a free weekend */
GfParmReleaseHandle( results ); GfParmReleaseHandle( results );
GfParmReleaseHandle( params ); GfParmReleaseHandle( params );

3
src/modules/sound/snddefault/CarSoundData.cpp
View file

@ -274,9 +274,6 @@ void CarSoundData::calculateTyreSound(tCarElt* car)
if (car==NULL) { if (car==NULL) {
fprintf (stderr, "Error: (grsound.c) no car\n"); fprintf (stderr, "Error: (grsound.c) no car\n");
continue; continue;
} else if (car->priv.wheel==NULL) {
fprintf (stderr, "Error: (grsound.c) no wheels\n");
continue;
} else if (car->priv.wheel[i].seg==NULL) { } else if (car->priv.wheel[i].seg==NULL) {
fprintf (stderr, "Error: (grsound.c) no seg\n"); fprintf (stderr, "Error: (grsound.c) no seg\n");
continue; continue;

2
src/modules/userinterface/legacymenu/racescreens/racenexteventmenu.cpp
View file

@ -95,7 +95,7 @@ RmNextEventMenu(void)
for (xx = 1; xx < (int)GfParmGetNum(results, RE_SECT_CURRENT, RE_ATTR_CUR_TRACK, NULL, 1); ++xx) for (xx = 1; xx < (int)GfParmGetNum(results, RE_SECT_CURRENT, RE_ATTR_CUR_TRACK, NULL, 1); ++xx)
{ {
snprintf(buf, sizeof(buf), "%s/%d", RM_SECT_TRACKS, xx); snprintf(buf, sizeof(buf), "%s/%d", RM_SECT_TRACKS, xx);
if (!strcmp( GfParmGetStr(reInfo->params, buf, RM_ATTR_NAME, "free"), "free") == 0) if (strcmp( GfParmGetStr(reInfo->params, buf, RM_ATTR_NAME, "free"), "free") != 0)
++raceNumber; ++raceNumber;
} }