diff options
| author | Simon <simon@hardwired.org.uk> | 2011-02-04 10:24:35 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-02-04 10:24:35 (GMT) |
| commit | 9469a3b46a80970fc1d2a11df8c8692de90b6c00 (patch) | |
| tree | ac8069712226ab150076c3af32cd2b1ab3a71d7b /src/air.c | |
| parent | 525a59e28011cf26993c8e3f040a36ba7b7bf5e2 (diff) | |
| parent | 9064cabf288be8ecb2fbc1c15bb4071cf3df1c22 (diff) | |
| download | powder-9469a3b46a80970fc1d2a11df8c8692de90b6c00.zip powder-9469a3b46a80970fc1d2a11df8c8692de90b6c00.tar.gz | |
Merge with cracker, also fix version
Diffstat (limited to 'src/air.c')
| -rw-r--r-- | src/air.c | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -86,8 +86,8 @@ void update_air(void) dp = 0.0f; dp += vx[y][x-1] - vx[y][x]; dp += vy[y-1][x] - vy[y][x]; - pv[y][x] *= PLOSS; - pv[y][x] += dp*TSTEPP; + pv[y][x] *= AIR_PLOSS; + pv[y][x] += dp*AIR_TSTEPP; } for (y=0; y<YRES/CELL-1; y++) @@ -96,10 +96,10 @@ void update_air(void) dx = dy = 0.0f; dx += pv[y][x] - pv[y][x+1]; dy += pv[y][x] - pv[y+1][x]; - vx[y][x] *= VLOSS; - vy[y][x] *= VLOSS; - vx[y][x] += dx*TSTEPV; - vy[y][x] += dy*TSTEPV; + vx[y][x] *= AIR_VLOSS; + vy[y][x] *= AIR_VLOSS; + vx[y][x] += dx*AIR_TSTEPV; + vy[y][x] += dy*AIR_TSTEPV; if (bmap[y][x]==WL_WALL || bmap[y][x+1]==WL_WALL || bmap[y][x]==WL_WALLELEC || bmap[y][x+1]==WL_WALLELEC || (bmap[y][x]==WL_EWALL && !emap[y][x]) || @@ -148,20 +148,20 @@ void update_air(void) if (i>=2 && i<XRES/CELL-3 && j>=2 && j<YRES/CELL-3) { - dx *= 1.0f - VADV; - dy *= 1.0f - VADV; + dx *= 1.0f - AIR_VADV; + dy *= 1.0f - AIR_VADV; - dx += VADV*(1.0f-tx)*(1.0f-ty)*vx[j][i]; - dy += VADV*(1.0f-tx)*(1.0f-ty)*vy[j][i]; + dx += AIR_VADV*(1.0f-tx)*(1.0f-ty)*vx[j][i]; + dy += AIR_VADV*(1.0f-tx)*(1.0f-ty)*vy[j][i]; - dx += VADV*tx*(1.0f-ty)*vx[j][i+1]; - dy += VADV*tx*(1.0f-ty)*vy[j][i+1]; + dx += AIR_VADV*tx*(1.0f-ty)*vx[j][i+1]; + dy += AIR_VADV*tx*(1.0f-ty)*vy[j][i+1]; - dx += VADV*(1.0f-tx)*ty*vx[j+1][i]; - dy += VADV*(1.0f-tx)*ty*vy[j+1][i]; + dx += AIR_VADV*(1.0f-tx)*ty*vx[j+1][i]; + dy += AIR_VADV*(1.0f-tx)*ty*vy[j+1][i]; - dx += VADV*tx*ty*vx[j+1][i+1]; - dy += VADV*tx*ty*vy[j+1][i+1]; + dx += AIR_VADV*tx*ty*vx[j+1][i+1]; + dy += AIR_VADV*tx*ty*vy[j+1][i+1]; } if (bmap[y][x] == WL_FAN) |