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

Run stacking check less often

Browse Source 
But force it to be run after loading a save so that really extreme
numbers of stacked particles form BHOL immediately
This commit is contained in:
jacksonmj 2012-06-09 11:49:10 +01:00
parent 5d4c21d83b
commit 601766a3a0
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/powder.h
View File

@ -759,6 +759,7 @@ extern int portal_rx[8];
extern int portal_ry[8];
extern int wire_placed;
extern int force_stacking_check;
extern playerst player;
extern playerst player2;

2
src/main.c
View File

@ -1734,6 +1734,8 @@ int main(int argc, char *argv[])
bmap[cby][cbx] = cb_bmap[cby][cbx];
emap[cby][cbx] = cb_emap[cby][cbx];
}
force_stacking_check = 1;//check for excessive stacking of particles next time update_particles is run
}
}
#ifdef INTERNAL

14
src/powder.c
View File

@ -29,6 +29,7 @@
int wire_placed = 0;
int lighting_recreate = 0;
int force_stacking_check = 0;//whether to force a check for excessively stacked particles
playerst player;
playerst player2;
@ -1518,28 +1519,29 @@ void update_particles_i(pixel *vid, int start, int inc)
if (sys_pause&&!framerender)//do nothing if paused
return;
//if ((rand()%NPART)<NUM_PARTS*2) // run more often when more particles are on screen (since this is often due to excessive stacking)
if (1)
if (force_stacking_check || (rand()%10)==0)
{
force_stacking_check = 0;
excessive_stacking_found = 0;
for (y=0; y<YRES; y++)
{
for (x=0; x<XRES; x++)
{
// Use a threshold, since some particle stacking can be normal (e.g. BIZR + FILT)
// Setting pmap_count[y][x] >= NPART means BHOL will form in that spot
// Setting pmap_count[y][x] > NPART means BHOL will form in that spot
if (pmap_count[y][x]>5)
{
if (bmap[y/CELL][x/CELL]==WL_EHOLE)
{
// Allow more stacking in E-hole, allow up to 1500 particles
// Allow more stacking in E-hole
if (pmap_count[y][x]>1500)
{
pmap_count[y][x] = pmap_count[y][x] + NPART;
excessive_stacking_found = 1;
}
}
else
// Random chance to turn into BHOL that increases with the amount of stacking, up to a threshold where it is certain to turn into BHOL
else if (pmap_count[y][x]>1500 || (rand()%1600)<=(pmap_count[y][x]+100))
{
pmap_count[y][x] = pmap_count[y][x] + NPART;
excessive_stacking_found = 1;
@ -1564,7 +1566,7 @@ void update_particles_i(pixel *vid, int start, int inc)
{
create_part(i, x, y, PT_NBHL);
parts[i].temp = MAX_TEMP;
parts[i].tmp = pmap_count[y][x]-NPART;
parts[i].tmp = pmap_count[y][x]-NPART;//strength of grav field
pmap_count[y][x] = NPART;
}
else

1
src/save.c
View File

@ -54,6 +54,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
{
return 1;
}
force_stacking_check = 1;//check for excessive stacking of particles next time update_particles is run
if(saveData[0] == 'O' && saveData[1] == 'P' && saveData[2] == 'S')
{
return parse_save_OPS(save, size, replace, x0, y0, bmap, vx, vy, pv, fvx, fvy, signs, partsptr, pmap);