Index: edit.c
==================================================================
--- edit.c
+++ edit.c
@@ -11,10 +11,19 @@
 #include "smallxrm.h"
 #include "heromesh.h"
 #include "quarks.h"
 #include "cursorshapes.h"
 
+typedef struct {
+  Uint16 class;
+  Uint8 img,dir;
+  Value misc1,misc2,misc3;
+} MRU;
+
+static MRU mru[32];
+static int curmru;
+
 static void redraw_editor(void) {
   char buf[32];
   SDL_Rect r;
   int x,y;
   r.x=r.y=0;
@@ -62,11 +71,28 @@
   x=x>=left_margin?(x-left_margin)/picture_size+1:0;
   y=y/picture_size+1;
   if(x>0 && y>0 && x<=pfwidth && y<=pfheight) snprintf(buf,8,"(%2d,%2d)",x,y);
   else strcpy(buf,"       ");
   draw_text(0,40,buf,0xF0,0xF3);
+  for(x=0;x<32;x++) {
+    y=picture_size*x+56;
+    if(y+picture_size>screen->h) break;
+    if(x==curmru) draw_text(0,y,">",0xF0,0xFE);
+    if(mru[x].misc1.u|mru[x].misc1.t|mru[x].misc2.u|mru[x].misc2.t|mru[x].misc3.u|mru[x].misc3.t) draw_text(picture_size+16,y,"*",0xF0,0xFB);
+  }
   SDL_UnlockSurface(screen);
+  r.w=r.h=picture_size;
+  r.x=8;
+  for(x=0;x<32;x++) {
+    y=picture_size*x+56;
+    if(y+picture_size>screen->h) break;
+    if(mru[x].class) {
+      r.y=y;
+      SDL_FillRect(screen,&r,0x00);
+      draw_picture(8,y,classes[mru[x].class]->images[mru[x].img]);
+    }
+  }
   SDL_Flip(screen);
 }
 
 static void show_mouse_xy(SDL_Event*ev) {
   char buf[32];
@@ -98,13 +124,146 @@
   }
   s=sqlite3_str_finish(m);
   if(s) SDL_WM_SetCaption(s,s); else SDL_WM_SetCaption("Free Hero Mesh","Free Hero Mesh");
   sqlite3_free(s);
 }
+
+static void class_image_select(void) {
+  SDL_Event ev;
+  SDL_Rect r;
+  int clscroll=0;
+  int imgscroll=0;
+  int clcount=0;
+  int imgcount=0;
+  int cl=0;
+  int img=0;
+  Uint16 cllist[0x4000];
+  Uint8 imglist[256];
+  char name[256];
+  int namei=0;
+  char buf[4];
+  int i,j;
+  sqlite3_stmt*st;
+  if(sqlite3_prepare_v2(userdb,"SELECT `ID` FROM `CLASSES` WHERE `GROUP` IS NULL AND CLASS_DATA(`ID`,7) NOT NULL ORDER BY `NAME` COLLATE NOCASE;",-1,&st,0))
+   fatal("Unexpected SQL error: %s\n",sqlite3_errmsg(userdb));
+  while(sqlite3_step(st)==SQLITE_ROW) cllist[clcount++]=sqlite3_column_int(st,0);
+  sqlite3_finalize(st);
+  redraw:
+  r.y=r.x=0;
+  r.w=picture_size+40;
+  r.h=screen->h;
+  SDL_FillRect(screen,&r,0xF0);
+  r.x=picture_size+40;
+  r.w=screen->w-r.x;
+  SDL_FillRect(screen,&r,0xF1);
+  scrollbar(&clscroll,screen->h/8,clcount,0,&r);
+  r.x+=15;
+  r.h=8;
+  SDL_LockSurface(screen);
+  for(i=0;i<screen->h/8;i++) {
+    if(i+clscroll>=clcount) break;
+    j=cllist[i+clscroll];
+    if(j==cl) SDL_FillRect(screen,&r,0xF3);
+    draw_text(r.x,r.y,classes[j]->name,j==cl?0xF3:0xF1,classes[j]->cflags&CF_PLAYER?0xFE:0xFF);
+    if(j==cl && namei) {
+      memcpy(name,classes[j]->name,namei);
+      name[namei]=0;
+      draw_text(r.x,r.y,name,0xF4,classes[j]->cflags&CF_PLAYER?0xFE:0xFF);
+    }
+    r.y+=8;
+  }
+  SDL_UnlockSurface(screen);
+  scrollbar(&imgscroll,screen->h/picture_size,imgcount,0,0);
+  r.x=14;
+  r.y=0;
+  r.w=r.h=picture_size;
+  for(i=0;i<screen->h/picture_size;i++) {
+    if(i+imgscroll>=imgcount) break;
+    j=imglist[i+imgscroll];
+    SDL_FillRect(screen,&r,0);
+    draw_picture(14,r.y,classes[cl]->images[j]&0x7FFF);
+    r.y+=picture_size;
+  }
+  r.y=0;
+  SDL_LockSurface(screen);
+  for(i=0;i<screen->h/picture_size;i++) {
+    if(i+imgscroll>=imgcount) break;
+    j=imglist[i+imgscroll];
+    sprintf(buf,"%3d",j);
+    draw_text(picture_size+15,r.y,buf,j==img?0xF2:0xF0,j==img?0xFF:0xF7);
+    r.y+=picture_size;
+  }
+  SDL_UnlockSurface(screen);
+  SDL_Flip(screen);
+  while(SDL_WaitEvent(&ev)) {
+    if(ev.type!=SDL_VIDEOEXPOSE) {
+      if(scrollbar(&imgscroll,screen->h/picture_size,imgcount,&ev,0)) goto redraw;
+      r.h=screen->h;
+      r.x=picture_size+40;
+      r.y=0;
+      if(scrollbar(&clscroll,screen->h/8,clcount,&ev,&r)) goto redraw;
+    }
+    switch(ev.type) {
+      case SDL_MOUSEMOTION:
+        set_cursor(XC_draft_small);
+        break;
+      case SDL_MOUSEBUTTONDOWN:
+        if(ev.button.x>picture_size+40) {
+          i=clscroll+ev.button.y/8;
+          if(i<0 || i>=clcount) break;
+          namei=0;
+          cl=cllist[i];
+          setclass:
+          imgscroll=imgcount=0;
+          for(i=0;i<classes[cl]->nimages;i++) if(classes[cl]->images[i]&0x8000) imglist[imgcount++]=i;
+          img=*imglist;
+          goto redraw;
+        } else {
+          i=imgscroll+ev.button.y/picture_size;
+          if(i<0 || i>=imgcount) break;
+          img=imglist[i];
+          goto redraw;
+        }
+        break;
+      case SDL_KEYDOWN:
+        switch(ev.key.keysym.sym) {
+          case SDLK_HOME: clscroll=0; goto redraw;
+          case SDLK_END: clscroll=clcount-screen->h/8; goto redraw;
+          case SDLK_PAGEDOWN: clscroll+=screen->h/8; goto redraw;
+          case SDLK_PAGEUP: clscroll-=screen->h/8; goto redraw;
+          case SDLK_ESCAPE: return;
+          case SDLK_TAB: namei=0; goto redraw;
+          case SDLK_BACKSPACE: if(namei) --namei; goto redraw;
+          default:
+            j=ev.key.keysym.unicode;
+            if(j>32 && j<127 && namei<254) {
+              name[namei++]=j;
+              for(i=0;i<clcount;i++) {
+                if(!sqlite3_strnicmp(name,classes[cllist[i]]->name,namei)) {
+                  ev.button.button=1;
+                  cl=cllist[i];
+                  goto setclass;
+                }
+              }
+              --namei;
+            }
+        }
+        break;
+      case SDL_VIDEOEXPOSE:
+        goto redraw;
+      case SDL_QUIT:
+        exit(0);
+        break;
+    }
+  }
+}
 
 static int editor_command(int prev,int cmd,int number,int argc,sqlite3_stmt*args,void*aux) {
   switch(cmd) {
+    case '^c': // Select class/image
+      class_image_select();
+      return 0;
     case '^P': // Play
       return -2;
     case '^Q': // Quit
       return -1;
     default:
@@ -113,10 +272,11 @@
 }
 
 void run_editor(void) {
   SDL_Event ev;
   int i;
+  curmru=0;
   set_caption();
   load_level(level_id);
   redraw_editor();
   while(SDL_WaitEvent(&ev)) {
     switch(ev.type) {
@@ -129,12 +289,14 @@
       case SDL_MOUSEMOTION:
         set_cursor(ev.motion.x<left_margin?XC_arrow:XC_tcross);
         show_mouse_xy(&ev);
         break;
       case SDL_MOUSEBUTTONDOWN:
-        
-        if(ev.button.x<left_margin) break;
+        if(ev.button.x<left_margin) {
+          
+          break;
+        }
         // fallthrough
       case SDL_KEYDOWN:
         i=exec_key_binding(&ev,1,0,0,editor_command,0);
         if(i==-1) exit(0);
         if(i==-2) {