marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid some false positives on a naive Random-between-sequence-points check 

The check was git grep -Ewn -e 'Random\s*\([^;{}]+Random' src
Günther Brammer 2012-11-17 16:30:12 +01:00
parent c439c81362
commit 8a001972ab
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/landscape/C4Material.cpp
View File

@ -804,7 +804,10 @@ bool mrfInsertCheck(int32_t &iX, int32_t &iY, C4Real &fXDir, C4Real &fYDir, int3
// Incindiary mats smoke on contact even before doing their slide
if (::MaterialMap.Map[iPxsMat].Incindiary)
if (!Random(25)) Smoke(iX, iY, 4+Random(3) );
if (!Random(25))
{
Smoke(iX, iY, 4 + Random(3));
}
// Move by mat path/slide
int32_t iSlideX = iX, iSlideY = iY;
@ -916,16 +919,19 @@ bool C4MaterialMap::mrfCorrode(C4MaterialReaction *pReaction, int32_t &iX, int32
case meeMassMove: // MassMover-movement
{
// evaluate corrosion percentage
bool fDoCorrode;
bool fDoCorrode; int d100 = Random(100);
if (pReaction->fUserDefined)
fDoCorrode = (Random(100) < pReaction->iCorrosionRate);
fDoCorrode = (d100 < pReaction->iCorrosionRate);
else
fDoCorrode = (Random(100) < ::MaterialMap.Map[iPxsMat].Corrosive) && (Random(100) < ::MaterialMap.Map[iLsMat].Corrode);
fDoCorrode = (d100 < ::MaterialMap.Map[iPxsMat].Corrosive) && (d100 < ::MaterialMap.Map[iLsMat].Corrode);
if (fDoCorrode)
{
ClearBackPix(iLSPosX,iLSPosY);
//::Landscape.CheckInstabilityRange(iLSPosX,iLSPosY); - more correct, but makes acid too effective as well
if (!Random(5)) Smoke(iX,iY,3+Random(3));
if (!Random(5))
{
Smoke(iX, iY, 3 + Random(3));
}
if (!Random(20)) StartSoundEffectAt("Corrode", iX, iY);
return true;
}
@ -940,16 +946,19 @@ bool C4MaterialMap::mrfCorrode(C4MaterialReaction *pReaction, int32_t &iX, int32
// either splash or slide prevented interaction
return false;
// evaluate corrosion percentage
bool fDoCorrode;
bool fDoCorrode; int d100 = Random(100);
if (pReaction->fUserDefined)
fDoCorrode = (Random(100) < pReaction->iCorrosionRate);
fDoCorrode = (d100 < pReaction->iCorrosionRate);
else
fDoCorrode = (Random(100) < ::MaterialMap.Map[iPxsMat].Corrosive) && (Random(100) < ::MaterialMap.Map[iLsMat].Corrode);
fDoCorrode = (d100 < ::MaterialMap.Map[iPxsMat].Corrosive) && (d100 < ::MaterialMap.Map[iLsMat].Corrode);
if (fDoCorrode)
{
ClearBackPix(iLSPosX,iLSPosY);
::Landscape.CheckInstabilityRange(iLSPosX,iLSPosY);
if (!Random(5)) Smoke(iX,iY,3+Random(3));
if (!Random(5))
{
Smoke(iX,iY,3+Random(3));
}
if (!Random(20)) StartSoundEffectAt("Corrode", iX, iY);
return true;
}