diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-11-01 19:17:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-11-01 19:17:04 (GMT) |
| commit | 4f74cfa35dbc40be0cb6426a06d2eeb13b0df6c7 (patch) | |
| tree | f1317cb1a771a558c065ede4af2048fcacd96583 /src/main.c | |
| parent | 91f4a156dfabec29ae0dbcf445462259a266ab62 (diff) | |
| parent | 98e23875c83959957556a0859684b6770f76c996 (diff) | |
| download | powder-4f74cfa35dbc40be0cb6426a06d2eeb13b0df6c7.zip powder-4f74cfa35dbc40be0cb6426a06d2eeb13b0df6c7.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1800,6 +1800,9 @@ int main(int argc, char *argv[]) update_airh(); } +#ifdef OGLR + part_vbuf = vid_buf; +#else if(ngrav_enable && cmode==CM_FANCY) { part_vbuf = part_vbuf_store; @@ -1807,6 +1810,7 @@ int main(int argc, char *argv[]) } else { part_vbuf = vid_buf; } +#endif if(gravwl_timeout) { @@ -1978,8 +1982,10 @@ int main(int argc, char *argv[]) render_signs(part_vbuf); +#ifndef OGLR if(ngrav_enable && cmode==CM_FANCY) render_gravlensing(part_vbuf, vid_buf); +#endif memset(vid_buf+((XRES+BARSIZE)*YRES), 0, (PIXELSIZE*(XRES+BARSIZE))*MENUSIZE);//clear menu areas clearrect(vid_buf, XRES-1, 0, BARSIZE+1, YRES); |