Index: bindings.doc
==================================================================
--- bindings.doc
+++ bindings.doc
@@ -95,10 +95,13 @@
   Start or stop slow replay. Any move input also interrupts slow replay.
 
 '^s'
   Toggle solution replay.
 
+'lo' <location>
+  Flash the specified location briefly.
+
 'mi' <command>
   Import a move list. The argument is a operating system command, that
   when executed will write the move list to stdout, with one byte per
   move (the Hero Mesh key codes).
 

Index: default.heromeshrc
==================================================================
--- default.heromeshrc
+++ default.heromeshrc
@@ -124,10 +124,12 @@
 ?.gameKey.shift.f4: -1000
 ?.gameKey.f5: ^M
 ?.gameKey.f6: ^<
 ?.gameKey.f7: ^>
 ?.gameKey.f8: ^s
+?.gameKey.shift.f8: select 'ml',solution_move_list(1);
+?.gameKey.f9: select 'lo',xy(o.x,o.y) from objects o,classes c on(o.class=c.id) where c.player;
 ?.gameKey.tab: ^I
 ?.gameKey.alt.G: ^g
 ?.gameKey.alt.P: ^p
 ?.gameKey.alt.leftbracket: select 'rs',-5;
 ?.gameKey.alt.rightbracket: select 'rs',+5;
@@ -163,10 +165,11 @@
 ?.editClick.ctrl.left: select 'em',id from objects where x=$X and y=$Y and up is null;
 ?.editClick.alt.left: ^u
 ?.editClick.right: delete from objects where x=$X and y=$Y and up is null;
 ?.editClick.ctrl.right: select 'am',class,image,misc1,misc2,misc3,dir from objects where x=$X and y=$Y and up is null;
 ?.editClick.shift.left: ^<
+?.editClick.shift.middle: values('^Z',null),('^<',xy($X,$Y));
 ?.editClick.shift.right: ^>
 
 ! Global key bindings
 ?.?.kp_minus: select 'go',-(level()-1) where level()>1;
 ?.?.kp_plus: select 'go',-(level()+1) where level()<max_level();

Index: function.c
==================================================================
--- function.c
+++ function.c
@@ -388,10 +388,27 @@
   sqlite3_int64 a;
   if(sqlite3_value_type(*argv)==SQLITE_NULL) return;
   a=sqlite3_value_int64(*argv)&0xFFFFFFFF;
   sqlite3_result_int64(cxt,a-(a&0x80000000?0x100000000LL:0));
 }
+
+static void fn_solution_move_list(sqlite3_context*cxt,int argc,sqlite3_value**argv) {
+  long sz;
+  int i=3;
+  unsigned char*d=read_lump(FIL_SOLUTION,level_id,&sz);
+  if(sz<4 || !d || ((!argc || !sqlite3_value_int(*argv)) && (d[0]|(d[1]<<8))!=level_version)) {
+    free(d);
+    return;
+  }
+  if(d[2]&1) {
+    while(i<sz && d[i]) i++;
+    i++;
+  }
+  if(d[2]&2) i+=8;
+  if(i<sz) sqlite3_result_blob(cxt,d+i,sz-i,SQLITE_TRANSIENT);
+  free(d);
+}
 
 static void fn_trace_on(sqlite3_context*cxt,int argc,sqlite3_value**argv) {
   const char*v=sqlite3_user_data(cxt);
   if(main_options['t']=*v) puts("[Tracing enabled]"); else puts("[Tracing disabled]");
 }
@@ -1159,10 +1176,12 @@
   sqlite3_create_function(userdb,"RECT_Y0",0,SQLITE_UTF8,&editrect.y0,fn_rect_x0,0,0);
   sqlite3_create_function(userdb,"RECT_Y1",0,SQLITE_UTF8,&editrect.y1,fn_rect_x0,0,0);
   sqlite3_create_function(userdb,"RESOURCE",-1,SQLITE_UTF8|SQLITE_DETERMINISTIC,0,fn_resource,0,0);
   sqlite3_create_function(userdb,"SIGN_EXTEND",1,SQLITE_UTF8|SQLITE_DETERMINISTIC,0,fn_sign_extend,0,0);
   sqlite3_create_function(userdb,"SOLUTION_CACHEID",0,SQLITE_UTF8|SQLITE_DETERMINISTIC,ptr1,fn_cacheid,0,0);
+  sqlite3_create_function(userdb,"SOLUTION_MOVE_LIST",0,SQLITE_UTF8,0,fn_solution_move_list,0,0);
+  sqlite3_create_function(userdb,"SOLUTION_MOVE_LIST",1,SQLITE_UTF8,0,fn_solution_move_list,0,0);
   sqlite3_create_function(userdb,"TRACE_OFF",0,SQLITE_UTF8,"",fn_trace_on,0,0);
   sqlite3_create_function(userdb,"TRACE_ON",0,SQLITE_UTF8,"\x01",fn_trace_on,0,0);
   sqlite3_create_function(userdb,"XY",2,SQLITE_UTF8|SQLITE_DETERMINISTIC,0,fn_xy,0,0);
   sqlite3_create_function(userdb,"ZERO_EXTEND",1,SQLITE_UTF8|SQLITE_DETERMINISTIC,0,fn_zero_extend,0,0);
   bizarro_vtab=""; // ensure that it is not null

Index: game.c
==================================================================
--- game.c
+++ game.c
@@ -766,10 +766,13 @@
       if(replay_count) replay_count=0,begin_level(level_id); else load_replay();
       return 1;
     case 'go': // Select level
       begin_level(number);
       return 1;
+    case 'lo': // Locate me
+      locate_me(number&63?:64,number/64?:64);
+      return prev;
     case 'mi': // Move list import
       if(argc<2 || solution_replay) break;
       if(replay_pos) begin_level(level_id);
       do_import_moves(sqlite3_column_text(args,1));
       return 1;

Index: game.doc
==================================================================
--- game.doc
+++ game.doc
@@ -121,18 +121,20 @@
   SHIFT+F4    Rewind 1000 moves
   F5          Set mark
   F6          Rewind to mark
   F7          Replay to mark
   F8          Toggle solution replay
+  SHIFT+F8    Copy solution
+  F9          Flash player position
   F10         SQL queries
-  ESCAPE      Restart level
+  ESC         Restart level
   TAB         Toggle inventory/replay display
   KP ENTER    Restart level
   KP +        Next level
   KP -        Previous level
   SHIFT+KP +  Last level
-  SHIFT+KP -  Previous level
+  SHIFT+KP -  First level
   ALT+G       Inspect globals
   ALT+P       Begin slow replay
   ALT+[       Increase slow replay speed
   ALT+]       Decrease slow replay speed
 
@@ -139,7 +141,6 @@
 Mouse (in grid):
 
   MIDDLE       Describe topmost object
   RIGHT        Inspect objects (main world)
   SHIFT+RIGHT  Inspect objects (bizarro world)
-
 

Index: sql.doc
==================================================================
--- sql.doc
+++ sql.doc
@@ -130,10 +130,14 @@
   Sign extends a 32-bit number to 64-bits.
 
 SOLUTION_CACHEID()
   The user cache ID of the level file.
 
+SOLUTION_MOVE_LIST(boolean)
+  Returns the solution move list. If the boolean value is true, then it
+  always loads it even if the level version number doesn't match.
+
 TRACE_OFF()
   Disables tracing when called.
 
 TRACE_ON()
   Enables tracing when called.