diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-12 00:35:55 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-12 00:35:55 (GMT) |
| commit | d69fc052fabf38b6691970c38abe4c8525eff3e8 (patch) | |
| tree | 857691fe7d792a8dde25167e134ed3e12ce01f9f /src/elements | |
| parent | d7fa0b139e5a91c3b1d406e63cae4a6ad79d0cd0 (diff) | |
| download | powder-d69fc052fabf38b6691970c38abe4c8525eff3e8.zip powder-d69fc052fabf38b6691970c38abe4c8525eff3e8.tar.gz | |
Fancy motion blur for OpenGL, fix a lot of dialogues in OpenGL, fix gravity lensing in OpenGL, ensure Phot and Neut are PMODE_ADD, not FLAT
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/neut.c | 5 | ||||
| -rw-r--r-- | src/elements/phot.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/elements/neut.c b/src/elements/neut.c index 658195a..afb0523 100644 --- a/src/elements/neut.c +++ b/src/elements/neut.c @@ -40,6 +40,8 @@ int create_n_parts(int n, int x, int y, float vx, float vy, float temp, int t)// parts[i].x = (float)x; parts[i].y = (float)y; + parts[i].lastX = (float)x; + parts[i].lastY = (float)y; parts[i].type = t; parts[i].life = rand()%480+480; parts[i].vx = r*cosf(a); @@ -160,6 +162,7 @@ int graphics_NEUT(GRAPHICS_FUNC_ARGS) *fireg = 80; *fireb = 120; - *pixel_mode |= FIRE_ADD; + *pixel_mode &= ~PMODE_FLAT; + *pixel_mode |= FIRE_ADD | PMODE_ADD; return 1; } diff --git a/src/elements/phot.c b/src/elements/phot.c index 66cf4eb..ba6fd25 100644 --- a/src/elements/phot.c +++ b/src/elements/phot.c @@ -94,6 +94,7 @@ int graphics_PHOT(GRAPHICS_FUNC_ARGS) *fireg = *colg; *fireb = *colb; - *pixel_mode |= FIRE_ADD; + *pixel_mode &= ~PMODE_FLAT; + *pixel_mode |= FIRE_ADD | PMODE_ADD; return 0; } |