Merge branch 'master' into itemprop

Changelog.txt

@@ -3427,7 +3427,7 @@ Additionally, the problem of zig-zag issue following in the South direction has
 - Fixed: Guildstone removal caused an exception (Issue #1165).
 - Fixed: In-game chat not working correctly and generating exceptions since last update (Issue #1140).
 
-24-10-2023, Jhobean
+10-11-2023, Jhobean
 - Added: Item properties functionnality:HITAREAPHYSICAL,HITAREAFIRE,HITAREACOLD,HITAREAPOISON,HITAREAENERGY,HITFIREBALL,HITHARM,HITLIGHTNING,HITMAGICARROW,REFLECTPHYSICALDAM
 
 

src/game/chars/CCharFight.cpp

@@ -1008,22 +1008,22 @@ void CChar::OnTakeDamageArea(int iDmg, CChar* pSrc, DAMAGE_TYPE uType, int iDmgP
 
     CWorldSearch AreaChars(GetTopPoint(), iDistance);
     for (;;)
-        //pSrc = char make the attach
-        //pChar = char get scan on loop iteration
+        //pSrc = Char make the attack
+        //pChar = Char scanned on the loop iteration
         //this = Char get the initial hit
     {
         CChar* pChar = AreaChars.GetChar();
         if (!pChar)
             break;
-        if ((pChar == this) || (pChar == pSrc))
+        if ((pChar == this) || (pChar == pSrc))                     //This char already receive the base hit. Damage already done
             continue;
-        if (pChar->Fight_CanHit(pSrc,true) == WAR_SWING_INVALID) //Check if target can be hit (I am invul, stone etc. Target is Disconnected,safe zone etc)
+        if (pChar->Fight_CanHit(pSrc,true) == WAR_SWING_INVALID)    //Check if target can be hit (I am invul, stone etc. Target is Disconnected,safe zone etc)
             continue;
         if (!pChar->m_pClient && pChar->NPC_IsOwnedBy(pSrc,false))	// it's my pet?
             continue;
-        if (!pChar->CanSeeLOS(pSrc)) //Avoid hit someone in nearby house
+        if (!pChar->CanSeeLOS(pSrc))                                //Avoid hit someone in nearby house
             continue;
-        if (pChar->Noto_CalcFlag(pSrc) == NOTO_GOOD) //Avoid to hit someone we can't legally attack (Same NOT , same guild, same party etc)
+        if (pChar->Noto_CalcFlag(pSrc) == NOTO_GOOD)                //Avoid to hit someone we can't legally attack (same guild, same party, Vendor etc)
             continue;
 
         pChar->OnTakeDamage(iDmg, pSrc, uType, iDmgPhysical, iDmgFire, iDmgCold, iDmgPoison, iDmgEnergy);