add player interaction haptics and fix sa

Author: finger563

components/doom/prboom/p_inter.c

@@ -361,6 +361,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
 
         // bonus items
     case SPR_BON1:
+      R_PlayerPickupHealth(player, 1);
       player->health++;               // can go over 100%
       if (player->health > (maxhealth * 2))
         player->health = (maxhealth * 2);
@@ -369,6 +370,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
       break;
 
     case SPR_BON2:
+      R_PlayerPickupArmor(player, 1);
       player->armorpoints++;          // can go over 100%
       if (player->armorpoints > max_armor)
         player->armorpoints = max_armor;
@@ -378,6 +380,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
       break;
 
     case SPR_SOUL:
+      R_PlayerPickupHealth(player, soul_health);
       player->health += soul_health;
       if (player->health > max_soul)
         player->health = max_soul;
@@ -389,6 +392,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
     case SPR_MEGA:
       if (gamemode != commercial)
         return;
+      R_PlayerPickupHealth(player, mega_health);
       player->health = mega_health;
       player->mo->health = player->health;
       P_GiveArmor (player,blue_armor_class);

components/doom/prboom/p_map.c

@@ -1727,7 +1727,7 @@ boolean PTR_NoWayTraverse(intercept_t* in)
 // Looks for special lines in front of the player to activate.
 //
 void P_UseLines (player_t*  player)
-  {
+{
   int     angle;
   fixed_t x1;
   fixed_t y1;
@@ -1749,10 +1749,12 @@ void P_UseLines (player_t*  player)
   //
   // This added test makes the "oof" sound work on 2s lines -- killough:
 
-  if (P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse ))
-    if (!comp[comp_sound] && !P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_NoWayTraverse ))
+  if (P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse )) {
+    if (!comp[comp_sound] && !P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_NoWayTraverse )) {
       S_StartSound (usething, sfx_noway);
+    }
   }
+}
 
 
 //

components/doom/prboom/p_switch.c

@@ -318,9 +318,11 @@ P_UseSpecialLine
       linefunc = EV_DoGenCrusher;
     }
 
-    if (linefunc)
+    if (linefunc) {
+      // [WILLIAM] - Callback to trigger haptics when using a switch
+      R_PlayerInteract(thing->player, line->special);
       switch((line->special & TriggerType) >> TriggerTypeShift)
-      {
+        {
         case PushOnce:
           if (!side)
             if (linefunc(line))
@@ -340,7 +342,8 @@ P_UseSpecialLine
           return true;
         default:  // if not a switch/push type, do nothing here
           return false;
-      }
+        }
+    }
   }
 
   // Switches that other things can activate.
@@ -372,6 +375,11 @@ P_UseSpecialLine
   if (!P_CheckTag(line))  //jff 2/27/98 disallow zero tag on some types
     return false;
 
+  if (thing->player) {
+    // [WILLIAM] - Callback to trigger haptics when using a switch
+    R_PlayerInteract(thing->player, line->special);
+  }
+
   // Dispatch to handler according to linedef type
   switch (line->special)
   {

components/doom/prboom/r_main.h

@@ -135,6 +135,8 @@ void R_PlayerPickupArmor(player_t *player, int armor);
 void R_PlayerPickupCard(player_t *player, card_t card);
 void R_PlayerPickupPowerUp(player_t *player, int powerup);
 
+void R_PlayerInteract(player_t *player, int special);
+
 // called when the player is hurt. damage is the amount of health lost, saved is
 // the amount of health saved by armor (which is the same as the amount of armor
 // lost)

components/doom/src/doom.cpp

@@ -144,6 +144,12 @@ extern "C" {
         box.play_haptic_effect(haptic_effect_index);
     }
 
+    void R_PlayerInteract(player_t *player, int special) {
+        static auto& box = BoxEmu::get();
+        // play 4 (sharp click - 100%)
+        box.play_haptic_effect(4);
+    }
+
     void R_PlayerPickupWeapon(player_t *player, int weapon) {
         static auto& box = BoxEmu::get();
         // play 29 (short double click strong 3 - 60%)

components/msx/src/msx.cpp

@@ -360,7 +360,6 @@ unsigned int WaitKey(void)
     // wait no more than 100ms for the user to press any key
     while (!wait_for_key(GamepadState::Button::ANY, true, 100)) {
         // wait for key
-        continue;
     }
 
     return GetKey();