Tweaks to setting health cvar

If giving player health, flash screen, play power-up sound and close console.
bradharding · Mar 25, 2017 · b7f4dc0 · b7f4dc0
1 parent e828598
commit b7f4dc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/c_cmds.c b/src/c_cmds.c
@@ -4389,9 +4389,6 @@ static void player_cvars_func2(char *cmd, char *parms)
                 if (!player->mo)
                     return;
 
-                if (value > player->health)
-                    P_AddBonus(player, BONUSADD);
-
                 value = BETWEEN(health_min, value, maxhealth);
 
                 if (player->health <= 0)
@@ -4402,24 +4399,20 @@ static void player_cvars_func2(char *cmd, char *parms)
                         player->mo->health = value;
                     }
                     else
-                    {
                         P_ResurrectPlayer(player, value);
-                        C_HideConsole();
-                    }
                 }
                 else if (!(player->cheats & CF_BUDDHA))
                 {
                     if (value < player->health)
-                    {
                         P_DamageMobj(player->mo, NULL, NULL, player->health - value, false);
-                        C_HideConsole();
-                    }
                     else
                     {
                         player->health = value;
                         player->mo->health = value;
+                        P_AddBonus(player, BONUSADD);
+                        S_StartSound(NULL, sfx_getpow);
                     }
-
+                    C_HideConsole();
                 }
             }
         }

diff --git a/src/p_inter.c b/src/p_inter.c
@@ -299,8 +299,7 @@ dboolean P_GiveFullAmmo(player_t *player)
 //
 void P_AddBonus(player_t *player, int amount)
 {
-    if (!consoleactive)
-        player->bonuscount = MIN(player->bonuscount + amount, 3 * TICRATE);
+    player->bonuscount = MIN(player->bonuscount + amount, 3 * TICRATE);
 }
 
 //