diff options
| author | Simon <simon@hardwired.org.uk> | 2011-01-27 20:14:20 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-01-27 20:14:20 (GMT) |
| commit | aedb16efb9601a6699201484064f13b61ba30b5c (patch) | |
| tree | 2eb884105c366a0f770b36eeddf58c7ab5fdccb5 /src | |
| parent | ce0708eccdf1bd86c35c28467a4b3ea2b0ce1de4 (diff) | |
| parent | 60d3f0047b21c6a1b34d07f0c0ac8c3cbc708289 (diff) | |
| download | powder-aedb16efb9601a6699201484064f13b61ba30b5c.zip powder-aedb16efb9601a6699201484064f13b61ba30b5c.tar.gz | |
Fixes from cracker
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 22 | ||||
| -rw-r--r-- | src/powder.c | 8 |
2 files changed, 22 insertions, 8 deletions
@@ -487,6 +487,10 @@ int parse_save(void *save, int size, int replace, int x0, int y0) memset(vx, 0, sizeof(vx)); memset(vy, 0, sizeof(vy)); memset(pv, 0, sizeof(pv)); + memset(photons, 0, sizeof(photons)); + memset(wireless, 0, sizeof(wireless)); + memset(gol2, 0, sizeof(gol2)); + memset(portal, 0, sizeof(portal)); } // make a catalog of free parts @@ -1535,6 +1539,16 @@ int main(int argc, char *argv[]) if(sdl_key=='=') { int nx, ny; + if(sdl_mod & (KMOD_CTRL)) + { + for(i=0;i<NPART;i++) + if(parts[i].type==PT_SPRK) + { + parts[i].type = parts[i].ctype; + parts[i].life = 0; + } + } + else for(nx = 0;nx<XRES/CELL;nx++) for(ny = 0;ny<YRES/CELL;ny++) { @@ -2076,6 +2090,10 @@ int main(int argc, char *argv[]) memset(bmap, 0, sizeof(bmap)); memset(emap, 0, sizeof(emap)); memset(parts, 0, sizeof(particle)*NPART); + memset(photons, 0, sizeof(photons)); + memset(wireless, 0, sizeof(wireless)); + memset(gol2, 0, sizeof(gol2)); + memset(portal, 0, sizeof(portal)); for(i=0; i<NPART-1; i++) parts[i].life = i+1; parts[NPART-1].life = -1; @@ -2132,10 +2150,6 @@ int main(int argc, char *argv[]) if(x>=19 && x<=35 && svf_last && svf_open && !bq){ //int tpval = sys_pause; parse_save(svf_last, svf_lsize, 1, 0, 0); - for(j= 0;j<99;j++){ //reset wifi on reload - wireless[j][0] = 0; - wireless[j][1] = 0; - } //sys_pause = tpval; } if(x>=(XRES+BARSIZE-(510-476)) && x<=(XRES+BARSIZE-(510-491)) && !bq) diff --git a/src/powder.c b/src/powder.c index 2d9a6d0..27b48fa 100644 --- a/src/powder.c +++ b/src/powder.c @@ -583,8 +583,6 @@ inline int create_part(int p, int x, int y, int t) } } } - if(photons[y][x] && t==PT_PHOT) - return -1; if(pfree == -1) return -1; i = pfree; @@ -876,6 +874,7 @@ static void create_gain_photon(int pp) parts[i].vy = parts[pp].vy; parts[i].temp = parts[pmap[ny][nx] >> 8].temp; parts[i].tmp = 0; + photons[ny][nx] = PT_PHOT|(i<<8); temp_bin = (int)((parts[i].temp-273.0f)*0.25f); if(temp_bin < 0) temp_bin = 0; @@ -911,6 +910,7 @@ static void create_cherenkov_photon(int pp) parts[i].y = parts[pp].y; parts[i].temp = parts[pmap[ny][nx] >> 8].temp; parts[i].tmp = 0; + photons[ny][nx] = PT_PHOT|(i<<8); if(lr) { parts[i].vx = parts[pp].vx - 2.5f*parts[pp].vy; @@ -1112,7 +1112,7 @@ int nearest_part(int ci, int t) void update_particles_i(pixel *vid, int start, int inc) { - int i, j, x, y, t, nx, ny, r, a, s, lt, rt, fe, nt, lpv, nearp, pavg, nnx, nny, q, golnum, goldelete, z, ctype, temp, trade, docontinue, nxx, nyy, nxi, nyi; + int i, j, x, y, t, nx, ny, r, a, s, lt, rt, fe, nt, lpv, nearp, pavg, nnx, nny, q, golnum, goldelete, z, ctype, temp, trade, docontinue, nxx, nyy, nxi, nyi, neighbors; float mv, dx, dy, ix, iy, lx, ly, d, pp, nrx, nry, dp, rr, rrr; float nn, ct1, ct2; float pt = R_TEMP; @@ -1308,7 +1308,7 @@ void update_particles_i(pixel *vid, int start, int inc) for(ny=CELL;ny<YRES-CELL;ny++) { r = pmap[ny][nx]; - int neighbors = gol2[nx][ny][0]; + neighbors = gol2[nx][ny][0]; if(neighbors==0 || !(ptypes[r&0xFF].properties&PROP_LIFE || !r&0xFF) || (r>>8)>=NPART) continue; for( golnum = 1;golnum<NGOL;golnum++) |