From 7b69f3ef9620790e50581e503bd874ce1fcc6812 Mon Sep 17 00:00:00 2001
From: biscuitWizard <1904063+biscuitWizard@users.noreply.github.com>
Date: Tue, 31 Jan 2023 02:39:22 +0000
Subject: [PATCH] Fixing dazzling display

---
 act.h          | 2 +-
 spell_parser.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/act.h b/act.h
index 597668e1..d115e131 100755
--- a/act.h
+++ b/act.h
@@ -594,7 +594,7 @@ ACMD_DECL(do_dragonborn_breath_weapon);
 ACMDCHECK(can_dragonborn_breath_weapon);
 ACMD_DECL(do_tabaxi_claw_attack);
 ACMDCHECK(can_tabaxi_claw_attack);
-ACMDCHECK(do_dazzling_display);
+ACMD_DECL(do_dazzling_display);
 ACMDCHECK(can_dazzling_display);
 ACMD_DECL(do_blast);
 ACMDCHECK(can_eldritch_blast);
diff --git a/spell_parser.c b/spell_parser.c
index 2c0a25fc..d062e330 100755
--- a/spell_parser.c
+++ b/spell_parser.c
@@ -522,13 +522,10 @@ int call_magic(struct char_data *caster, struct char_data *cvict,
     {
     case CLASS_WARLOCK:
     case CLASS_BARD:
-      int max_armor_size = ARMOR_TYPE_LIGHT;
-      if (HAS_FEAT(caster, FEAT_BATTLE_CASTER))
-        max_armor_size = ARMOR_TYPE_MEDIUM;
       if (!canCastAtWill(caster, spellnum))
       {
         /* bards & warlocks can wear light armor and cast unpenalized (bard spells) */
-        if (compute_gear_armor_type(caster) > max_armor_size ||
+        if (compute_gear_armor_type(caster) > (HAS_FEAT(caster, FEAT_BATTLE_CASTER) ? ARMOR_TYPE_MEDIUM : ARMOR_TYPE_LIGHT) ||
             compute_gear_shield_type(caster) > ARMOR_TYPE_SHIELD)
           if (rand_number(1, 100) <= compute_gear_spell_failure(caster))
           {