diff --git a/src/drivers/simplix/src/unitpit.cpp b/src/drivers/simplix/src/unitpit.cpp index b56ce355e..cc432f0ba 100644 --- a/src/drivers/simplix/src/unitpit.cpp +++ b/src/drivers/simplix/src/unitpit.cpp @@ -9,7 +9,7 @@ // File : unitpit.cpp // Created : 2007.02.20 // Last changed : 2014.11.29 -// Copyright : © 2007-2014 Wolf-Dieter Beelitz +// Copyright : � 2007-2014 Wolf-Dieter Beelitz // eMail : wdbee@users.sourceforge.net // Version : 4.05.000 //--------------------------------------------------------------------------* @@ -31,17 +31,17 @@ // // Das Programm wurde unter Windows XP entwickelt und getestet. // Fehler sind nicht bekannt, dennoch gilt: -// Wer die Dateien verwendet erkennt an, dass für Fehler, Schäden, -// Folgefehler oder Folgeschäden keine Haftung übernommen wird. +// Wer die Dateien verwendet erkennt an, dass f�r Fehler, Sch�den, +// Folgefehler oder Folgesch�den keine Haftung �bernommen wird. //--------------------------------------------------------------------------* // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. // -// Im übrigen gilt für die Nutzung und/oder Weitergabe die +// Im �brigen gilt f�r die Nutzung und/oder Weitergabe die // GNU GPL (General Public License) -// Version 2 oder nach eigener Wahl eine spätere Version. +// Version 2 oder nach eigener Wahl eine sp�tere Version. //--------------------------------------------------------------------------* // WARNING: // @@ -1035,15 +1035,16 @@ double TPitLane::DistToPitStop(double TrackPos, bool Pitting) const DL += (float)(oPitStopOffset - TRACKRES / 2); // LogSimplix.debug("DistToPitStop: %g-%g=%g\n",dist,DL,dist-DL); Dist = DL; - if (Dist < 0) - Dist += oTrack->Length(); + if (Dist < 0) + Dist += oTrack->Length(); } else { - Dist = oPitStopPos - oPitEntryStartPos; - if (Dist < 0) - Dist += oTrack->Length(); - Dist += DistToPitEntry(TrackPos); + Dist = oPitStopPos - oPitEntryStartPos; + if (Dist < 0) + Dist += oTrack->Length(); + + Dist += DistToPitEntry(TrackPos); } return Dist; } diff --git a/src/libs/tgf/params.cpp b/src/libs/tgf/params.cpp index a99a749bd..8b5554f38 100644 --- a/src/libs/tgf/params.cpp +++ b/src/libs/tgf/params.cpp @@ -3936,14 +3936,14 @@ tdble GfParmGetVariable(void *handle, char const *path, char const *key) char *str; tdble *val; strcpy( pathdup, path ); - if( pathdup[ 0 ] == '/' ) - memmove( pathdup, pathdup + sizeof( char ), sizeof( char ) * strlen( pathdup ) ); + if ( pathdup[ 0 ] == '/' ) + memmove( pathdup, pathdup + sizeof( char ), sizeof( char ) * strlen( pathdup ) ); - if ((parmHandle == NULL) || (parmHandle->magic != PARM_MAGIC)) { - GfLogError ("GfParmGetVariable: bad handle (%p)\n", parmHandle); - free(pathdup); - return 0.0f; - } + if ((parmHandle == NULL) || (parmHandle->magic != PARM_MAGIC)) { + GfLogError ("GfParmGetVariable: bad handle (%p)\n", parmHandle); + free(pathdup); + return 0.0f; + } conf = parmHandle->conf; diff --git a/src/libs/tgfclient/glfeatures.cpp b/src/libs/tgfclient/glfeatures.cpp index db0afc028..0be494e02 100644 --- a/src/libs/tgfclient/glfeatures.cpp +++ b/src/libs/tgfclient/glfeatures.cpp @@ -821,19 +821,18 @@ bool GfglFeatures::loadSupport(int &nWidth, int &nHeight, int &nDepth, // 11) Bump Mapping. const std::string strBumpMapping = GfParmGetStr(hparm, GFSCR_SECT_GLDETFEATURES, GFSCR_ATT_BUMPMAPPING, ""); - if (strTexComp == GFSCR_VAL_YES) //strTexComp ? Bug ? + if (strTexComp == GFSCR_VAL_YES) //strTexComp ? Bug ? _mapSupportedBool[BumpMapping] = true; else if (strTexComp == GFSCR_VAL_NO) _mapSupportedBool[BumpMapping] = false; - // 11) Anisotropic Filtering. - const int nAF = - (int)GfParmGetNum(hparm, GFSCR_SECT_GLDETFEATURES, GFSCR_ATT_ANISOTROPICFILTERING, - pszNoUnit, (tdble)0); - if (nMaxTexSize > 0) - _mapSupportedInt[AnisotropicFiltering] =nAF; + // 11) Anisotropic Filtering. + const int nAF = + (int)GfParmGetNum(hparm, GFSCR_SECT_GLDETFEATURES, GFSCR_ATT_ANISOTROPICFILTERING, + pszNoUnit, (tdble)0); + if (nMaxTexSize > 0) + _mapSupportedInt[AnisotropicFiltering] =nAF; - // Close config file if we open it. if (!hparmConfig) closeConfigFile(hparm); @@ -1256,11 +1255,11 @@ void GfglFeatures::storeSelection(void* hparmConfig) const isSelected(BumpMapping) ? GFSCR_ATT_BUMPMAPPING_ENABLED : GFSCR_ATT_BUMPMAPPING_DISABLED); - if (getSupported(AnisotropicFiltering) != InvalidInt) - GfParmSetNum(hparm, GFSCR_SECT_GLSELFEATURES, GFSCR_ATT_ANISOTROPICFILTERING, pszNoUnit, - (tdble)getSelected(AnisotropicFiltering)); - else - GfParmRemove(hparm, GFSCR_SECT_GLSELFEATURES, GFSCR_ATT_ANISOTROPICFILTERING); + if (getSupported(AnisotropicFiltering) != InvalidInt) + GfParmSetNum(hparm, GFSCR_SECT_GLSELFEATURES, GFSCR_ATT_ANISOTROPICFILTERING, pszNoUnit, + (tdble)getSelected(AnisotropicFiltering)); + else + GfParmRemove(hparm, GFSCR_SECT_GLSELFEATURES, GFSCR_ATT_ANISOTROPICFILTERING); // Write new params to config file. GfParmWriteFile(NULL, hparm, "Screen"); diff --git a/src/modules/graphic/ssggraph/grmain.cpp b/src/modules/graphic/ssggraph/grmain.cpp index e8531dac9..af0f342ce 100644 --- a/src/modules/graphic/ssggraph/grmain.cpp +++ b/src/modules/graphic/ssggraph/grmain.cpp @@ -360,18 +360,18 @@ grSplitScreen(void *vp) case GR_SPLIT_ADD: if (grNbActiveScreens < GR_NB_MAX_SCREEN) grNbActiveScreens++; - if (grSpanSplit) - grNbArrangeScreens=1; - else - grNbArrangeScreens=0; + if (grSpanSplit) + grNbArrangeScreens=1; + else + grNbArrangeScreens=0; break; case GR_SPLIT_REM: if (grNbActiveScreens > 1) grNbActiveScreens--; - if (grSpanSplit) - grNbArrangeScreens=1; - else - grNbArrangeScreens=0; + if (grSpanSplit) + grNbArrangeScreens=1; + else + grNbArrangeScreens=0; break; case GR_SPLIT_ARR: grNbArrangeScreens++; diff --git a/src/modules/racing/genparoptv1/raceresults.cpp b/src/modules/racing/genparoptv1/raceresults.cpp index 09a36ee9d..59c29e4dd 100644 --- a/src/modules/racing/genparoptv1/raceresults.cpp +++ b/src/modules/racing/genparoptv1/raceresults.cpp @@ -636,11 +636,11 @@ ReUpdateRaceCurRes() ncars = ReInfo->s->_ncars; if (ncars > ReUI().getResultsTableRowCount()) - ncars = ReUI().getResultsTableRowCount(); + ncars = ReUI().getResultsTableRowCount(); - char pszTitle[128]; - snprintf(pszTitle, sizeof(pszTitle), "%s at %s", - ReInfo->_reRaceName, ReInfo->track->name); + char pszTitle[128]; + snprintf(pszTitle, sizeof(pszTitle), "%s at %s", + ReInfo->_reRaceName, ReInfo->track->name); if (ReInfo->s->_totTime > ReInfo->s->currentTime) { diff --git a/src/modules/racing/standardgame/raceresults.cpp b/src/modules/racing/standardgame/raceresults.cpp index 1af14bee2..5bac4da51 100644 --- a/src/modules/racing/standardgame/raceresults.cpp +++ b/src/modules/racing/standardgame/raceresults.cpp @@ -650,11 +650,11 @@ ReUpdateRaceCurRes() ncars = ReInfo->s->_ncars; if (ncars > ReUI().getResultsTableRowCount()) - ncars = ReUI().getResultsTableRowCount(); + ncars = ReUI().getResultsTableRowCount(); - char pszTitle[128]; - snprintf(pszTitle, sizeof(pszTitle), "%s at %s", - ReInfo->_reRaceName, ReInfo->track->name); + char pszTitle[128]; + snprintf(pszTitle, sizeof(pszTitle), "%s at %s", + ReInfo->_reRaceName, ReInfo->track->name); if (ReInfo->s->_totTime > ReInfo->s->currentTime) { diff --git a/src/modules/userinterface/legacymenu/legacymenu.cpp b/src/modules/userinterface/legacymenu/legacymenu.cpp index e88217b60..68bd66a9f 100644 --- a/src/modules/userinterface/legacymenu/legacymenu.cpp +++ b/src/modules/userinterface/legacymenu/legacymenu.cpp @@ -63,7 +63,7 @@ int closeGfModule() if (LegacyMenu::_pSelf) LegacyMenu::unregister(LegacyMenu::_pSelf); - DisplayMenuRelease(); + DisplayMenuRelease(); // Delete the (only) module instance. delete LegacyMenu::_pSelf;