Mercurial > mm7

diff CastSpellInfo.cpp @ 2494:de8c5c223e9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
for ACTOR_
author Ritor1
date Tue, 16 Sep 2014 17:48:58 +0600
parents 85a12b497698
children 5abd8fc8f1c6
line wrap: on
line diff
--- a/CastSpellInfo.cpp	Mon Sep 15 17:30:29 2014 +0600
+++ b/CastSpellInfo.cpp	Tue Sep 16 17:48:58 2014 +0600
@@ -629,7 +629,7 @@
         {
           Actor::AI_Stand(PID_ID(a2), 4, 0x80, 0);
           pActors[mon_id].pActorBuffs[ACTOR_BUFF_PARALYZED].Apply(pParty->uTimePlayed + (signed __int64)((double)(signed int)23040 * spell_level * 0.033333335), skill_level, 0, 0, 0);
-          pActors[mon_id].uAttributes |= 0x80000;
+          pActors[mon_id].uAttributes |= ACTOR_AGGRESSOR;
           pActors[mon_id].vVelocity.x = 0;
           pActors[mon_id].vVelocity.y = 0;
           pGame->GetStru6()->_4A7E89_sparkles_on_actor_after_it_casts_buff(&pActors[mon_id], 0);
@@ -655,7 +655,7 @@
         if (PID_TYPE(a2) == OBJECT_Actor && pActors[mon_id].DoesDmgTypeDoDamage((DAMAGE_TYPE)3) )
         {
           pActors[mon_id].pActorBuffs[ACTOR_BUFF_SLOWED].Apply(pParty->uTimePlayed + (signed __int64)((double)(signed int)23040 * spell_level * 0.033333335), skill_level, amount, 0, 0);
-          pActors[mon_id].uAttributes |= 0x80000;
+          pActors[mon_id].uAttributes |= ACTOR_AGGRESSOR;
           pGame->GetStru6()->_4A7E89_sparkles_on_actor_after_it_casts_buff(&pActors[mon_id], 0);
         }
         spell_sound_flag = true;
@@ -1870,7 +1870,7 @@
         {
           mon_id = PID_ID(pCastSpell->spell_target_pid);
           pActors[mon_id].pActorBuffs[ACTOR_BUFF_FATE].Apply(pParty->uTimePlayed + 1280, skill_level, amount, 0, 0);
-          pActors[mon_id].uAttributes |= 0x80000;
+          pActors[mon_id].uAttributes |= ACTOR_AGGRESSOR;
           pGame->GetStru6()->_4A7E89_sparkles_on_actor_after_it_casts_buff(&pActors[mon_id], 0);
         }
         spell_sound_flag = true;
@@ -2145,7 +2145,7 @@
         if (PID_TYPE(a2) == OBJECT_Actor)
         {
           mon_id = PID_ID(a2);
-          if ( !(pActors[mon_id].uAttributes & 0x800000) )
+          if ( !pActors[mon_id].ActorHasItem() )
             pActors[mon_id].SetRandomGoldIfTheresNoItem();
           int gold_num = 0;
           if ( pItemsTable->pItems[pActors[mon_id].ActorHasItems[3].uItemID].uEquipType == EQUIP_GOLD )
@@ -2892,7 +2892,7 @@
         pActors[mon_id].pMonsterInfo.uTreasureLevel = 0;
         pActors[mon_id].pMonsterInfo.uTreasureType = 0;
         pActors[mon_id].uAlly = 9999;
-        pActors[mon_id].uAttributes &= 0xF70000;
+        pActors[mon_id].ResetAggressor();//~0x80000
         pActors[mon_id].uGroup = 0;
         pActors[mon_id].pActorBuffs[ACTOR_BUFF_BERSERK].Reset();
         pActors[mon_id].pActorBuffs[ACTOR_BUFF_CHARM].Reset();