matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix negative tmp sing possibly generating max particles

Browse Source
This commit is contained in:
jacob1 2015-01-17 14:45:20 -05:00
parent 8c1db513f6
commit 94e635b65d
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/simulation/elements/SING.cpp
View File

@ -49,7 +49,7 @@ Element_SING::Element_SING()
//#TPT-Directive ElementHeader Element_SING static int update(UPDATE_FUNC_ARGS) //#TPT-Directive ElementHeader Element_SING static int update(UPDATE_FUNC_ARGS)
int Element_SING::update(UPDATE_FUNC_ARGS) int Element_SING::update(UPDATE_FUNC_ARGS)
{ {
int r, rx, ry, cry, crx, nb, j, spawncount; int r, rx, ry, cry, crx, nb, spawncount;
int singularity = -parts[i].life; int singularity = -parts[i].life;
float angle, v; float angle, v;
@ -82,11 +82,9 @@ int Element_SING::update(UPDATE_FUNC_ARGS)
} }
} }
} }
spawncount = (parts[i].tmp>255)?255:parts[i].tmp; spawncount = std::abs(parts[i].tmp);
if (spawncount>=1) spawncount = (spawncount>255) ? 3019 : std::pow((int)(spawncount/8), 2)*M_PI;
spawncount = spawncount/8; for (int j = 0;j < spawncount; j++)
spawncount = spawncount*spawncount*M_PI;
for (j=0;j<spawncount;j++)
{ {
switch(rand()%3) switch(rand()%3)
{ {