Merge branch 'main' into mr-2

2025-12-20 00:19:49 +01:00
parent 6850f3f98e d486caa4f7
commit 5b5ddd5d6b
5 changed files with 30 additions and 25 deletions
--- a/src/game/char_skill.cpp
+++ b/src/game/char_skill.cpp
@@ -2499,6 +2499,11 @@ bool CHARACTER::UseSkill(DWORD dwVnum, LPCHARACTER pkVictim, bool bUseGrandMaste
 	if (!pkSk)
 		return false;

+	if (IsPC() && IS_SET(pkSk->dwFlag, SKILL_FLAG_ATTACK))
+	{
+		EnterCombat();
+	}
+
 	if (bCanUseHorseSkill && pkSk->dwType != SKILL_TYPE_HORSE)
 		return BATTLE_NONE;