Index: edit.c
==================================================================
--- edit.c
+++ edit.c
@@ -346,14 +346,17 @@
         break;
       case SDL_MOUSEBUTTONDOWN:
         if(ev.button.x<left_margin) {
           
           break;
+        } else {
+          i=exec_key_binding(&ev,1,(ev.button.x-left_margin)/picture_size+1,ev.button.y/picture_size+1,editor_command,0);
+          goto command;
         }
-        // fallthrough
       case SDL_KEYDOWN:
         i=exec_key_binding(&ev,1,0,0,editor_command,0);
+      command:
         if(i==-1) exit(0);
         if(i==-2) {
           main_options['e']=0;
           return;
         }

Index: exec.c
==================================================================
--- exec.c
+++ exec.c
@@ -218,10 +218,11 @@
   objects=0;
   gameover=0;
 }
 
 const char*execute_turn(int key) {
+  // Set key=0 for initialization
   if(setjmp(my_env)) return my_error;
   changed=0;
   key_ignored=0;
   lastimage_processing=0;
   vstackptr=0;

Index: game.c
==================================================================
--- game.c
+++ game.c
@@ -115,14 +115,17 @@
         break;
       case SDL_MOUSEBUTTONDOWN:
         if(ev.button.x<left_margin) {
           
           break;
+        } else {
+          i=exec_key_binding(&ev,0,(ev.button.x-left_margin)/picture_size+1,ev.button.y/picture_size+1,game_command,0);
+          goto command;
         }
-        // fallthrough
       case SDL_KEYDOWN:
         i=exec_key_binding(&ev,0,0,0,game_command,0);
+      command:
         if(i==-1) exit(0);
         if(i==-2) {
           main_options['e']=1;
           return;
         }

Index: picture.c
==================================================================
--- picture.c
+++ picture.c
@@ -198,10 +198,31 @@
         SDL_UnlockSurface(screen);
         SDL_Flip(screen);
     }
   }
 }
+
+void screen_message(const char*txt) {
+  SDL_Rect r;
+  SDL_Event ev;
+  
+  set_cursor(XC_iron_cross);
+  SDL_Flip(screen);
+  while(SDL_WaitEvent(&ev)) {
+    switch(ev.type) {
+      case SDL_QUIT:
+        SDL_PushEvent(&ev);
+        return;
+      case SDL_KEYDOWN:
+        
+        return;
+      case SDL_MOUSEBUTTONDOWN:
+        
+        return;
+    }
+  }
+}
 
 static Uint16 decide_picture_size(int nwantsize,const Uint8*wantsize,const Uint16*havesize,int n) {
   int i,j;
   if(!nwantsize) fatal("Unable to determine what picture size is wanted\n");
   for(i=0;i<nwantsize;i++) if(havesize[j=wantsize[i]]==n) return j;