rnd-19980820

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index ed43f4ec90d015436452eb51ec7fd486ad17c093..940fd3790891bc48cd7a3a50731f9480a192a617 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -160,6 +160,11 @@ void HandleExposeEvent(XExposeEvent *event)
     SetDrawtoField(DRAW_DIRECT);
   }
 
+  if (soft_scrolling_on && game_status==PLAYING)
+    XCopyArea(display,fieldbuffer,backbuffer,gc,
+             FX,FY, SXSIZE,SYSIZE,
+             SX,SY);
+
   XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
 
   XFlush(display);
@@ -202,6 +207,7 @@ void HandleFocusEvent(XFocusChangeEvent *event)
     XAutoRepeatOn(display);
     old_joystick_status = joystick_status;
     joystick_status = JOYSTICK_OFF;
+    key_joystick_mapping = 0;
   }
   else if (event->type == FocusIn)
   {
@@ -662,18 +668,6 @@ void HandleJoystick()
        return;
       }
 
-
-#if 0
-      if (PlayerMovPos)
-      {
-       ScrollFigure(0);
-       /*
-       BackToFront();
-       */
-      }
-#endif
-
-
       if (tape.pausing || PlayerGone)
        joy = 0;
 
@@ -727,13 +721,6 @@ void HandleJoystick()
          }
        }
       }
-
-
-      /*
-      DrawPlayerField();
-      */
-
-
       break;
     }
     default: