diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-14 12:18:00 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-14 12:18:00 (GMT) |
| commit | 37e15bf3ad5a728e0394f40b9f4691de7464c6ea (patch) | |
| tree | 0373de1bc26047e211098277d24df38e77d89799 /src/powder.c | |
| parent | 1af0a86e0d2f5659f4672a8db0ca67da6e980e51 (diff) | |
| download | powder-37e15bf3ad5a728e0394f40b9f4691de7464c6ea.zip powder-37e15bf3ad5a728e0394f40b9f4691de7464c6ea.tar.gz | |
Replace use of gravy and gravf with gravxf and gravyf
Diffstat (limited to 'src/powder.c')
| -rw-r--r-- | src/powder.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/powder.c b/src/powder.c index 0633f75..b56426b 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1729,13 +1729,13 @@ void update_particles_i(pixel *vid, int start, int inc) if (t==PT_ANAR) { // perhaps we should have a ptypes variable for this - pGravX -= gravx[y/CELL][x/CELL]; - pGravY -= gravy[y/CELL][x/CELL]; + pGravX -= gravxf[(y*XRES)+x]; + pGravY -= gravyf[(y*XRES)+x]; } else if(t!=PT_STKM && t!=PT_STKM2 && !(ptypes[t].properties & TYPE_SOLID)) { - pGravX += gravx[y/CELL][x/CELL]; - pGravY += gravy[y/CELL][x/CELL]; + pGravX += gravxf[(y*XRES)+x]; + pGravY += gravyf[(y*XRES)+x]; } //velocity updates for the particle parts[i].vx *= ptypes[t].loss; @@ -1990,7 +1990,7 @@ void update_particles_i(pixel *vid, int start, int inc) s = 1; - gravtot = fabsf(gravy[y/CELL][x/CELL])+fabsf(gravx[y/CELL][x/CELL]); + gravtot = fabs(gravyf[(y*XRES)+x])+fabs(gravxf[(y*XRES)+x]); if (pv[y/CELL][x/CELL]>ptransitions[t].phv&&ptransitions[t].pht>-1) { // particle type change due to high pressure if (ptransitions[t].pht!=PT_NUM) @@ -2354,8 +2354,8 @@ killed: pGravX = ptGrav * ((float)(nx - XCNTR) / pGravD); pGravY = ptGrav * ((float)(ny - YCNTR) / pGravD); } - pGravX += gravx[ny/CELL][nx/CELL]; - pGravY += gravy[ny/CELL][nx/CELL]; + pGravX += gravxf[(ny*XRES)+nx]; + pGravY += gravyf[(ny*XRES)+nx]; if (fabsf(pGravY)>fabsf(pGravX)) mv = fabsf(pGravY); else @@ -2413,8 +2413,8 @@ killed: pGravX = ptGrav * ((float)(nx - XCNTR) / pGravD); pGravY = ptGrav * ((float)(ny - YCNTR) / pGravD); } - pGravX += gravx[ny/CELL][nx/CELL]; - pGravY += gravy[ny/CELL][nx/CELL]; + pGravX += gravxf[(ny*XRES)+nx]; + pGravY += gravyf[(ny*XRES)+nx]; if (fabsf(pGravY)>fabsf(pGravX)) mv = fabsf(pGravY); else |