summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-01-04 18:00:28 (GMT)
committer Simon <simon@hardwired.org.uk>2011-01-04 18:00:28 (GMT)
commit85138b970dba6c3200ebc631d09f1216d9f7d6dc (patch)
treea09508bccdc54302c47349a87983c4674982e3d8 /src
parent3a2bc7664336fc386cde95dbdd3ca782b89cf0ac (diff)
downloadpowder-85138b970dba6c3200ebc631d09f1216d9f7d6dc.zip
powder-85138b970dba6c3200ebc631d09f1216d9f7d6dc.tar.gz
Make frame-capture a little more noob-friendly
Diffstat (limited to 'src')
-rw-r--r--src/main.c51
1 files changed, 27 insertions, 24 deletions
diff --git a/src/main.c b/src/main.c
index 25a2503..2dedeea 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1614,32 +1614,33 @@ int main(int argc, char *argv[])
}
}
#ifdef INTERNAL
- int counterthing;
- if(sdl_key=='v')
- {
- if(sdl_mod & (KMOD_SHIFT)){
- if(vs>=1)
- vs = 0;
- else
- vs = 2;
- }
- else{
- if(vs>=1)
- vs = 0;
- else
- vs = 1;
+ int counterthing;
+ if(sdl_key=='v'&&!(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL)))
+ {
+ if(sdl_mod & (KMOD_SHIFT)){
+ if(vs>=1)
+ vs = 0;
+ else
+ vs = 2;
+ }
+ else
+ {
+ if(vs>=1)
+ vs = 0;
+ else
+ vs = 1;
+ }
+ counterthing = 0;
}
- counterthing = 0;
- }
if(vs)
- {
- if(counterthing+1>=vs)
- {
- dump_frame(vid_buf, XRES, YRES, XRES+BARSIZE);
- counterthing = 0;
- }
- counterthing = (counterthing+1)%3;
- }
+ {
+ if(counterthing+1>=vs)
+ {
+ dump_frame(vid_buf, XRES, YRES, XRES+BARSIZE);
+ counterthing = 0;
+ }
+ counterthing = (counterthing+1)%3;
+ }
#endif
if(sdl_wheel)
@@ -2412,6 +2413,8 @@ int main(int argc, char *argv[])
strappend(uitext, " [CAP LOCKS]");
if(GRID_MODE)
sprintf(uitext, "%s [GRID: %d]", uitext, GRID_MODE);
+ if(vs)
+ strappend(uitext, " [FRAME CAPTURE]");
if(sdl_zoom_trig||zoom_en)
{