more haptics

Author: finger563

components/doom/prboom/p_inter.c

@@ -113,6 +113,11 @@ static boolean P_GiveAmmo(player_t *player, ammotype_t ammo, int num)
   else
     num = clipammo[ammo]/2;
 
+  // [WILLIAM] - trigger haptic effect for the player picking up ammo
+  // printf("Player %d picked up ammo %d\n",
+  //        player - players, num);
+  R_PlayerPickupAmmo(player, ammo, num);
+
   // give double ammo in trainer mode, you'll need in nightmare
   if (gameskill == sk_baby || gameskill == sk_nightmare)
     num <<= 1;
@@ -210,6 +215,11 @@ static boolean P_GiveWeapon(player_t *player, weapontype_t weapon, boolean dropp
       gaveweapon = true;
       player->weaponowned[weapon] = true;
       player->pendingweapon = weapon;
+      // [WILLIAM] - trigger haptic effect for the player picking up a weapon
+      //
+      // printf("Player %d picked up weapon %d\n",
+      //       player - players, weapon);
+      R_PlayerPickupWeapon(player, weapon);
     }
   return gaveweapon || gaveammo;
 }
@@ -227,6 +237,10 @@ static boolean P_GiveBody(player_t *player, int num)
   if (player->health > maxhealth)
     player->health = maxhealth;
   player->mo->health = player->health;
+  // [WILLIAM] - trigger haptic effect for the player picking up health
+  // printf("Player %d picked up health %d\n",
+  //        player - players, num);
+  R_PlayerPickupHealth(player, num);
   return true;
 }
 
@@ -243,6 +257,10 @@ static boolean P_GiveArmor(player_t *player, int armortype)
     return false;   // don't pick up
   player->armortype = armortype;
   player->armorpoints = hits;
+  // [WILLIAM] - trigger haptic effect for the player picking up armor
+  // printf("Player %d picked up armor %d\n",
+  //        player - players, armortype);
+  R_PlayerPickupArmor(player, armortype);
   return true;
 }
 
@@ -256,6 +274,11 @@ static void P_GiveCard(player_t *player, card_t card)
     return;
   player->bonuscount = BONUSADD;
   player->cards[card] = 1;
+
+  // [WILLIAM] - trigger haptic effect for the player picking up a card
+  // printf("Player %d picked up card %d\n",
+  //        player - players, card);
+  R_PlayerPickupCard(player, card);
 }
 
 //
@@ -289,6 +312,12 @@ boolean P_GivePower(player_t *player, int power)
 
   if (player->powers[power] >= 0)
     player->powers[power] = tics[power];
+
+  // [WILLIAM] - trigger haptic effect for the player picking up a powerup
+  // printf("Player %d picked up powerup %d\n",
+  //        player - players, power);
+  R_PlayerPickupPowerUp(player, power);
+
   return true;
 }
 

components/doom/prboom/r_main.h

@@ -127,7 +127,13 @@ void R_PlayerFire(player_t *player);
 
 // called when the player picks up a weapon, can get player->readyweapon to know
 // which weapon
-void R_PlayerPickupWeapon(player_t *player);
+void R_PlayerPickupWeapon(player_t *player, int weapon);
+
+void R_PlayerPickupAmmo(player_t *player, ammotype_t ammo, int num);
+void R_PlayerPickupHealth(player_t *player, int health);
+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);
 
 // 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

components/doom/src/doom.cpp

@@ -133,13 +133,53 @@ extern "C" {
         static auto& box = BoxEmu::get();
         int haptic_effect_index = 0;
         if (damage > 5) {
+            // 70 - transition ramp down long smooth 1 - 100 to 0%
+            // 75 - transition ramp down short smooth 2 - 100 to 0%
             haptic_effect_index = saved > 0 ? 70 : 75;
         } else if (damage > 0) {
+            // 78 - transition ramp down medium sharp 1 - 100 to 0%
+            // 64 - transition hum 100%
             haptic_effect_index = saved > 0 ? 78 : 64;
         }
         box.play_haptic_effect(haptic_effect_index);
     }
 
+    void R_PlayerPickupWeapon(player_t *player, int weapon) {
+        static auto& box = BoxEmu::get();
+        // play 29 (short double click strong 3 - 60%)
+        box.play_haptic_effect(29);
+    }
+
+    void R_PlayerPickupAmmo(player_t *player, ammotype_t ammo, int num) {
+        static auto& box = BoxEmu::get();
+        // play 34 (short double sharp tick 1 - 100%)
+        box.play_haptic_effect(34);
+    }
+
+    void R_PlayerPickupHealth(player_t *player, int health) {
+        static auto& box = BoxEmu::get();
+        // play 18 (strong click 2 - 80%)
+        box.play_haptic_effect(18);
+    }
+
+    void R_PlayerPickupArmor(player_t *player, int armor) {
+        static auto& box = BoxEmu::get();
+        // play 19 (strong click 3 - 60%)
+        box.play_haptic_effect(19);
+    }
+
+    void R_PlayerPickupCard(player_t *player, card_t card) {
+        static auto& box = BoxEmu::get();
+        // play 5 (sharp click - 60%)
+        box.play_haptic_effect(5);
+    }
+
+    void R_PlayerPickupPowerUp(player_t *player, int powerup) {
+        static auto& box = BoxEmu::get();
+        // play 12 (triple click - 100%)
+        box.play_haptic_effect(12);
+    }
+
     void I_StartFrame(void) {
     }