removed preprocessor definition for network mode that is always true now
[rocksndiamonds.git] / src / tools.c
index 19965d47a3c9ab9f08a41928f16ce316f48223c5..aac531f02f3964afc8504d3cbbbe3372c67628b4 100644 (file)
@@ -4227,11 +4227,24 @@ static int RequestHandleEvents(unsigned int req_state)
                  result = old_player_nr + 1;
                  break;
 
+               case KSYM_Up:
                case KSYM_1:
+                 result = 1;
+                 break;
+
+               case KSYM_Right:
                case KSYM_2:
+                 result = 2;
+                 break;
+
+               case KSYM_Down:
                case KSYM_3:
+                 result = 3;
+                 break;
+
+               case KSYM_Left:
                case KSYM_4:
-                 result = key - KSYM_1 + 1;
+                 result = 4;
                  break;
 
                default:
@@ -4253,19 +4266,52 @@ static int RequestHandleEvents(unsigned int req_state)
              case SDL_CONTROLLER_BUTTON_A:
              case SDL_CONTROLLER_BUTTON_X:
              case SDL_CONTROLLER_BUTTON_LEFTSHOULDER:
+             case SDL_CONTROLLER_BUTTON_LEFTSTICK:
                result = 1;
                break;
 
              case SDL_CONTROLLER_BUTTON_B:
              case SDL_CONTROLLER_BUTTON_Y:
              case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER:
+             case SDL_CONTROLLER_BUTTON_RIGHTSTICK:
              case SDL_CONTROLLER_BUTTON_BACK:
                result = 0;
                break;
            }
 
            if (req_state & REQ_PLAYER)
-             result = 0;
+           {
+             int old_player_nr = setup.network_player_nr;
+
+             if (result != -1)
+               result = old_player_nr + 1;
+
+             switch (event.cbutton.button)
+             {
+               case SDL_CONTROLLER_BUTTON_DPAD_UP:
+               case SDL_CONTROLLER_BUTTON_Y:
+                 result = 1;
+                 break;
+
+               case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
+               case SDL_CONTROLLER_BUTTON_B:
+                 result = 2;
+                 break;
+
+               case SDL_CONTROLLER_BUTTON_DPAD_DOWN:
+               case SDL_CONTROLLER_BUTTON_A:
+                 result = 3;
+                 break;
+
+               case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
+               case SDL_CONTROLLER_BUTTON_X:
+                 result = 4;
+                 break;
+
+               default:
+                 break;
+             }
+           }
 
            break;
 
@@ -4290,6 +4336,22 @@ static int RequestHandleEvents(unsigned int req_state)
       else if (joy & JOY_BUTTON_2)
        result = 0;
     }
+    else if (AnyJoystick())
+    {
+      int joy = AnyJoystick();
+
+      if (req_state & REQ_PLAYER)
+      {
+       if (joy & JOY_UP)
+         result = 1;
+       else if (joy & JOY_RIGHT)
+         result = 2;
+       else if (joy & JOY_DOWN)
+         result = 3;
+       else if (joy & JOY_LEFT)
+         result = 4;
+      }
+    }
 
     if (level_solved)
     {
@@ -4330,13 +4392,11 @@ static boolean RequestDoor(char *text, unsigned int req_state)
 
   SetMouseCursor(CURSOR_DEFAULT);
 
-#if defined(NETWORK_AVALIABLE)
   /* pause network game while waiting for request to answer */
-  if (options.network &&
+  if (network.enabled &&
       game_status == GAME_MODE_PLAYING &&
       req_state & REQUEST_WAIT_FOR_INPUT)
     SendToServer_PausePlaying();
-#endif
 
   old_door_state = GetDoorState();
 
@@ -4472,13 +4532,11 @@ static boolean RequestDoor(char *text, unsigned int req_state)
     SetDrawBackgroundMask(REDRAW_FIELD);
   }
 
-#if defined(NETWORK_AVALIABLE)
   /* continue network game after request */
-  if (options.network &&
+  if (network.enabled &&
       game_status == GAME_MODE_PLAYING &&
       req_state & REQUEST_WAIT_FOR_INPUT)
     SendToServer_ContinuePlaying();
-#endif
 
   /* restore deactivated drawing when quick-loading level tape recording */
   if (tape.playing && tape.deactivate_display)
@@ -4500,13 +4558,11 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
 
   SetMouseCursor(CURSOR_DEFAULT);
 
-#if defined(NETWORK_AVALIABLE)
   /* pause network game while waiting for request to answer */
-  if (options.network &&
+  if (network.enabled &&
       game_status == GAME_MODE_PLAYING &&
       req_state & REQUEST_WAIT_FOR_INPUT)
     SendToServer_PausePlaying();
-#endif
 
   /* simulate releasing mouse button over last gadget, if still pressed */
   if (button_status)
@@ -4559,13 +4615,11 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
     SetDrawBackgroundMask(REDRAW_FIELD);
   }
 
-#if defined(NETWORK_AVALIABLE)
   /* continue network game after request */
-  if (options.network &&
+  if (network.enabled &&
       game_status == GAME_MODE_PLAYING &&
       req_state & REQUEST_WAIT_FOR_INPUT)
     SendToServer_ContinuePlaying();
-#endif
 
   /* restore deactivated drawing when quick-loading level tape recording */
   if (tape.playing && tape.deactivate_display)