Index: commandline.doc
==================================================================
--- commandline.doc
+++ commandline.doc
@@ -35,10 +35,13 @@
   used together with -C, -H, -L, -M to see how it is parsing it.
 
 -e
   Start in the editor instead of game.
 
+-f
+  Only flush the user cache and then terminate.
+
 -n
   Create a new puzzle set. The .xclass and .class files should already
   exist; the .level and .solution files should not already exist, and will
   be created with minimal data.
 

Index: main.c
==================================================================
--- main.c
+++ main.c
@@ -887,10 +887,11 @@
     if(main_options['r']) fatal("Switches -r and -n are conflicting\n");
     main_options['x']=1;
   }
   if(main_options['a']) main_options['r']=main_options['x']=1;
   if(main_options['p']) main_options['r']=1;
+  if(main_options['f']) main_options['x']=1;
   if(!main_options['c']) load_options();
   if(argc>optind) read_options(argc-optind,argv+optind);
   *optionquery=xrm_make_quark(globalclassname,0)?:xrm_anyq;
 #ifdef __GNUC__
   stack_protect_mark=__builtin_frame_address(0);
@@ -924,13 +925,17 @@
   if(level_ord=strtol(xrm_get_resource(resourcedb,optionquery,optionquery,2)?:"",0,10)) log_if_error(load_level(-level_ord));
   optionquery[1]=Q_maxTrigger;
   max_trigger=strtol(xrm_get_resource(resourcedb,optionquery,optionquery,2)?:"",0,10);
   if(main_options['a']) run_auto_test();
   if(main_options['x']) {
+    if(main_options['f']) {
+      flush_usercache();
+      return 0;
+    }
     fprintf(stderr,"Ready for executing SQL statements.\n");
     no_dead_anim=1;
     do_sql_mode();
     return 0;
   }
   set_autosave();
   for(;;) { if(main_options['e']) run_editor(); else run_game(); }
 }

Index: man6/heromesh.6
==================================================================
--- man6/heromesh.6
+++ man6/heromesh.6
@@ -27,10 +27,12 @@
 Only load classes and then terminate.
 This can be used to verify that the class definition file does not contain syntax errors.
 You can also use it with some other options to display details.
 .IP -e
 Start the level editor.
+.IP -f
+Only flush the user cache and then terminate.
 .IP -n
 Create a new puzzle set.
 The class definition file and image set must already exist.
 .IP -p
 Start the picture editor.