X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=7ea4356bc8920f6afaa51f0c7bdc397ad4a64b93;hb=ada99a47e3f92033d7039f09160ab3b43e8b85d2;hp=65b06803a9e62f2f7693939f74a6df4ae9f605e6;hpb=b6764658a537d18821afe606350e26d95b6daff6;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 65b06803..7ea4356b 100644
--- a/src/events.c
+++ b/src/events.c
@@ -127,7 +127,7 @@ void EventLoop(void)
 
       while (NextValidEvent(&event))
       {
-  	switch(event.type)
+  	switch (event.type)
   	{
   	  case EVENT_BUTTONPRESS:
   	  case EVENT_BUTTONRELEASE:
@@ -194,7 +194,7 @@ void EventLoop(void)
 
 void HandleOtherEvents(Event *event)
 {
-  switch(event->type)
+  switch (event->type)
   {
     case EVENT_EXPOSE:
       HandleExposeEvent((ExposeEvent *) event);
@@ -238,7 +238,7 @@ void ClearEventQueue()
 
     NextEvent(&event);
 
-    switch(event.type)
+    switch (event.type)
     {
       case EVENT_BUTTONRELEASE:
 	button_status = MB_RELEASED;
@@ -281,7 +281,7 @@ void SleepWhileUnmapped()
 
     NextEvent(&event);
 
-    switch(event.type)
+    switch (event.type)
     {
       case EVENT_BUTTONRELEASE:
 	button_status = MB_RELEASED;
@@ -667,8 +667,18 @@ void HandleKey(Key key, int key_status)
 	  element_dropped[pnr] = FALSE;
 	}
       }
+#if 1
+      else if (tape.recording && tape.pausing)
+      {
+	/* prevent key release events from un-pausing a paused game */
+	if (key_status == KEY_PRESSED &&
+	    (key_action & KEY_ACTION))
+	  TapeTogglePause(TAPE_TOGGLE_MANUAL);
+      }
+#else
       else if (tape.recording && tape.pausing && (key_action & KEY_ACTION))
 	TapeTogglePause(TAPE_TOGGLE_MANUAL);
+#endif
     }
   }
   else
@@ -701,6 +711,9 @@ void HandleKey(Key key, int key_status)
 
     ToggleFullscreenIfNeeded();
 
+    if (game_status == GAME_MODE_SETUP)
+      RedrawSetupScreenAfterFullscreenToggle();
+
     return;
   }
 
@@ -768,7 +781,7 @@ void HandleKey(Key key, int key_status)
       key = KSYM_UNDEFINED;
   }
 
-  switch(game_status)
+  switch (game_status)
   {
     case GAME_MODE_PSEUDO_TYPENAME:
       HandleTypeName(0, key);
@@ -780,7 +793,7 @@ void HandleKey(Key key, int key_status)
     case GAME_MODE_SETUP:
     case GAME_MODE_INFO:
     case GAME_MODE_SCORES:
-      switch(key)
+      switch (key)
       {
 	case KSYM_space:
 	case KSYM_Return:
@@ -851,7 +864,7 @@ void HandleKey(Key key, int key_status)
 
     case GAME_MODE_PLAYING:
     {
-      switch(key)
+      switch (key)
       {
         case KSYM_Escape:
 	  RequestQuitGame(setup.ask_on_escape);
@@ -1016,7 +1029,7 @@ void HandleJoystick()
   int dx	= (left ? -1	: right ? 1	: 0);
   int dy	= (up   ? -1	: down  ? 1	: 0);
 
-  switch(game_status)
+  switch (game_status)
   {
     case GAME_MODE_TITLE:
     case GAME_MODE_MAIN: