From a358a1763f8f66074dccc7fe1210239b681fcd78 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Mon, 18 Apr 2016 00:53:58 +0200 Subject: [PATCH] Some more FIXMEs --- Sources/EntitiesMP/Common/Particles.cpp | 2 +- Sources/GameMP/Controls.cpp | 3 ++- Sources/SeriousSam/Menu.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Sources/EntitiesMP/Common/Particles.cpp b/Sources/EntitiesMP/Common/Particles.cpp index d488fb2..8c5c846 100755 --- a/Sources/EntitiesMP/Common/Particles.cpp +++ b/Sources/EntitiesMP/Common/Particles.cpp @@ -1591,7 +1591,7 @@ INDEX Particles_Regeneration(CEntity *pen, FLOAT tmStart, FLOAT tmStop, FLOAT fY UBYTE ubR = (UBYTE) (192+afStarsPositions[iRnd][1]*64); UBYTE ubG = (UBYTE) (192+afStarsPositions[iRnd][2]*64); - UBYTE ubB = (UBYTE) (192+afStarsPositions[iRnd][3]*64); + UBYTE ubB = (UBYTE) (192+afStarsPositions[iRnd][3]*64); // FIXME DG: afStarsPositions[i][3] invalid, what's going on here? UBYTE ubA = (UBYTE) CalculateRatio( fT, 0.0f, 1.0f, 0.4f, 0.01f)*255; COLOR colLine = RGBToColor( ubR, ubG, ubB) | ubA; diff --git a/Sources/GameMP/Controls.cpp b/Sources/GameMP/Controls.cpp index 4539739..b6c4df4 100644 --- a/Sources/GameMP/Controls.cpp +++ b/Sources/GameMP/Controls.cpp @@ -227,8 +227,9 @@ void CControls::Load_t( CTFileName fnFile) achrActionName[ 0] = 0; FLOAT fSensitivity = 50; FLOAT fDeadZone = 0; + // FIXME DG: gcc and clang say the followign has too many arguments for the given format sscanf( achrLine, "%*[^\"]\"%1024[^\"]\"%*[^\"]\"%1024[^\"]\" %g %g %1024s %1024s", - achrActionName, achrAxis, &fSensitivity, &fDeadZone, achrIfInverted, achrIfRelative, achrIfSmooth); + achrActionName, achrAxis, &fSensitivity, &fDeadZone, achrIfInverted, achrIfRelative, achrIfSmooth); // find action axis INDEX iActionAxisNo = -1; {for( INDEX iAxis=0; iAxisga_strRequiredMod.ScanF("%250[^\\]\\%s", &strModName, &strModURL); _fnmModSelected = CTString(strModName); _strModURLSelected = strModURL; - if (_strModURLSelected="") { + if (_strModURLSelected="") { // FIXME DG: not == ? _strModURLSelected = "http://www.croteam.com/mods/Old"; } _strModServerSelected.PrintF("%s:%s", (const char *) _pGame->gam_strJoinAddress, (const char *) _pShell->GetValue("net_iPort"));