X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fevents.c;h=da828b587bbf9ded39bb9385fcc966932d3b5ea2;hb=69c2342c24b734fcbcd7c5ab2acfb2b3837f5c5a;hp=8d6cd62195f26bbc44bf79dec0287d087dc584e4;hpb=a8b2caa1d373c84c1b3fc2f615370c2a319051ca;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 8d6cd621..da828b58 100644
--- a/src/events.c
+++ b/src/events.c
@@ -326,15 +326,8 @@ void HandleFocusEvent(FocusChangeEvent *event)
 
 void HandleClientMessageEvent(ClientMessageEvent *event)
 {
-#ifdef TARGET_SDL
-  CloseAllAndExit(0);	/* the only possible message here is SDL_QUIT */
-#else
-#ifndef MSDOS
-  if ((event->window == window) &&
-      (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
+  if (CheckCloseWindowEvent(event))
     CloseAllAndExit(0);
-#endif
-#endif
 }
 
 void HandleButton(int mx, int my, int button)
@@ -702,10 +695,7 @@ void HandleKey(Key key, int key_status)
 	  printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize);
 	  break;
 
-#ifndef MSDOS
 	case KEY_Q:
-#endif
-	case KEY_q:
 	  local_player->dynamite = 1000;
 	  break;