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

simon updates, and SING improvements

Browse Source
This commit is contained in:
Cracker64 2010-12-30 14:59:39 -05:00
parent 2212d04fb0
commit 8604d27c7a
2 changed files with 59 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.c
View File

@ -2074,13 +2074,16 @@ int main(int argc, char *argv[])
} }
if(x>=(XRES+BARSIZE-(510-476)) && x<=(XRES+BARSIZE-(510-491)) && !bq) if(x>=(XRES+BARSIZE-(510-476)) && x<=(XRES+BARSIZE-(510-491)) && !bq)
{ {
if(b & SDL_BUTTON_LMASK) if(b & SDL_BUTTON_LMASK){
set_cmode((cmode+1) % CM_COUNT); set_cmode((cmode+1) % CM_COUNT);
if(b & SDL_BUTTON_RMASK) }
if((cmode+(CM_COUNT-1)) % CM_COUNT == CM_LIFE) if(b & SDL_BUTTON_RMASK){
set_cmode(CM_GRAD); if((cmode+(CM_COUNT-1)) % CM_COUNT == CM_LIFE) {
else set_cmode(CM_GRAD);
set_cmode((cmode+(CM_COUNT-1)) % CM_COUNT); } else {
set_cmode((cmode+(CM_COUNT-1)) % CM_COUNT);
}
}
save_presets(0); save_presets(0);
} }
if(x>=(XRES+BARSIZE-(510-494)) && x<=(XRES+BARSIZE-(510-509)) && !bq) if(x>=(XRES+BARSIZE-(510-494)) && x<=(XRES+BARSIZE-(510-509)) && !bq)

62
src/powder.c
View File

@ -426,6 +426,40 @@ void kill_part(int i)
pfree = i; pfree = i;
} }
#if defined(WIN32) && !defined(__GNUC__)
_inline int create_n_parts(int n, int x, int y, int t)
#else
inline int create_n_parts(int n, int x, int y, float vx, float vy, int t)
#endif
{
int i, c;
if(x<0 || y<0 || x>=XRES || y>=YRES)
return -1;
for (c; c<n; c++) {
float r = (rand()%128+128)/127.0f;
float a = (rand()%360)*3.14159f/180.0f;
if(pfree == -1)
return -1;
i = pfree;
pfree = parts[i].life;
parts[i].x = (float)x;
parts[i].y = (float)y;
parts[i].type = t;
parts[i].life = rand()%480+480;
parts[i].vx = r*cosf(a);
parts[i].vy = r*sinf(a);
parts[i].ctype = 0;
parts[i].temp += (n*17);
parts[i].tmp = 0;
pv[y/CELL][x/CELL] += 6.0f * CFDS;
}
return 0;
}
#if defined(WIN32) && !defined(__GNUC__) #if defined(WIN32) && !defined(__GNUC__)
_inline int create_part(int p, int x, int y, int t) _inline int create_part(int p, int x, int y, int t)
#else #else
@ -1406,6 +1440,14 @@ void update_particles_i(pixel *vid, int start, int inc)
if(y+CELL<YRES) if(y+CELL<YRES)
pv[y/CELL+1][x/CELL+1] += 0.1f*(singularity-pv[y/CELL+1][x/CELL+1]); pv[y/CELL+1][x/CELL+1] += 0.1f*(singularity-pv[y/CELL+1][x/CELL+1]);
} }
if(y+CELL>0 && pv[y/CELL-1][x/CELL]<singularity)
pv[y/CELL-1][x/CELL] += 0.1f*(singularity-pv[y/CELL-1][x/CELL]);
if(x+CELL>0)
{
pv[y/CELL][x/CELL-1] += 0.1f*(singularity-pv[y/CELL][x/CELL-1]);
if(y+CELL>0)
pv[y/CELL-1][x/CELL-1] += 0.1f*(singularity-pv[y/CELL-1][x/CELL-1]);
}
} }
else else
{ {
@ -2462,7 +2504,9 @@ void update_particles_i(pixel *vid, int start, int inc)
} }
if((r&0xFF)==PT_DEUT && (rt+1)>(rand()%1000)) if((r&0xFF)==PT_DEUT && (rt+1)>(rand()%1000))
{ {
#ifdef SDEUT
create_n_parts(parts[r>>8].life, x+nx, y+ny, parts[i].vx, parts[i].vy, PT_NEUT);
#else
create_part(r>>8, x+nx, y+ny, PT_NEUT); create_part(r>>8, x+nx, y+ny, PT_NEUT);
parts[r>>8].vx = 0.25f*parts[r>>8].vx + parts[i].vx; parts[r>>8].vx = 0.25f*parts[r>>8].vx + parts[i].vx;
parts[r>>8].vy = 0.25f*parts[r>>8].vy + parts[i].vy; parts[r>>8].vy = 0.25f*parts[r>>8].vy + parts[i].vy;
@ -2475,6 +2519,7 @@ void update_particles_i(pixel *vid, int start, int inc)
} }
else else
parts[r>>8].type = PT_NONE; parts[r>>8].type = PT_NONE;
#endif
} }
if((r&0xFF)==PT_GUNP && 15>(rand()%1000)) if((r&0xFF)==PT_GUNP && 15>(rand()%1000))
parts[r>>8].type = PT_DUST; parts[r>>8].type = PT_DUST;
@ -3604,31 +3649,24 @@ void update_particles_i(pixel *vid, int start, int inc)
continue; continue;
if(parts[r>>8].type!=PT_DMND&&33>=rand()/(RAND_MAX/100)+1) if(parts[r>>8].type!=PT_DMND&&33>=rand()/(RAND_MAX/100)+1)
{ {
if(parts[r>>8].life >10) if(parts[r>>8].type==PT_SING && parts[r>>8].life >10)
{ {
if(parts[i].life+parts[r>>8].life > 255) if(parts[i].life+parts[r>>8].life > 255)
{
if(parts[r>>8].type!=PT_SING && 1>rand()%20000)
{
parts[r>>8].type = PT_SING;
parts[r>>8].life = rand()%50+60;
}
continue; continue;
}
parts[i].life += parts[r>>8].life; parts[i].life += parts[r>>8].life;
} }
else else
{ {
if(parts[i].life+1 > 255) if(parts[i].life+3 > 255)
{ {
if(parts[r>>8].type!=PT_SING && 1>rand()%20000) if(parts[r>>8].type!=PT_SING && 1>rand()%100)
{ {
parts[r>>8].type = PT_SING; parts[r>>8].type = PT_SING;
parts[r>>8].life = rand()%50+60; parts[r>>8].life = rand()%50+60;
} }
continue; continue;
} }
parts[i].life += 1; parts[i].life += 3;
} }
parts[i].temp = restrict_flt(parts[r>>8].temp+parts[i].temp, MIN_TEMP, MAX_TEMP); parts[i].temp = restrict_flt(parts[r>>8].temp+parts[i].temp, MIN_TEMP, MAX_TEMP);
parts[r>>8].type=PT_NONE; parts[r>>8].type=PT_NONE;