summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-06-27 13:01:07 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-06-27 13:01:07 (GMT)
commit36ee81fc6b472ef956ad742ea3e626417c5317fe (patch)
tree0aba1a536e67d40e4c9a49775ea37ebd3af72b12 /src/main.c
parent43b75ea05855334646fc84f49729ac8d8d8763b2 (diff)
downloadpowder-36ee81fc6b472ef956ad742ea3e626417c5317fe.zip
powder-36ee81fc6b472ef956ad742ea3e626417c5317fe.tar.gz
Better photons for persistent display, ability to toggle gravity view (ctrl+g)
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index bcb524a..ac72abf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1804,7 +1804,7 @@ int main(int argc, char *argv[])
if (bsy<0)
bsy = 0;
- if(ngrav_enable)
+ if(ngrav_enable && drawgrav_enable)
draw_grav(vid_buf);
draw_walls(vid_buf);
update_particles(vid_buf); //update everything
@@ -2224,10 +2224,17 @@ int main(int argc, char *argv[])
}
if (sdl_key=='g')
{
- if (sdl_mod & (KMOD_SHIFT))
- GRID_MODE = (GRID_MODE+9)%10;
+ if(sdl_mod & (KMOD_CTRL))
+ {
+ drawgrav_enable =! drawgrav_enable;
+ }
else
- GRID_MODE = (GRID_MODE+1)%10;
+ {
+ if (sdl_mod & (KMOD_SHIFT))
+ GRID_MODE = (GRID_MODE+9)%10;
+ else
+ GRID_MODE = (GRID_MODE+1)%10;
+ }
}
if (sdl_key=='m')
{