Changeset 203 for trunk/src/game

Timestamp:

11/19/08 13:45:59 (17 years ago)

Author:

yumileroy

Message:

[svn] Send AttackStart? package when update visibility.
Update DoMeleeAttackIfReady? to support dual wield.
Show player modelid2 instead id3 of triggers. This should fix the bug that gameobject::castspell summon a human model.
Remove the correct flag to make creature attackable. This should fix the bug that Illidan and Magtheridon are unattackable.
Add NullCreatureAI for trinityscript.
Fix channeler's soul transfer.
Some update of black temple scripts.

Original author: megamage
Date: 2008-11-09 14:54:13-06:00

Location:

trunk/src/game

Files:

• GameObject.cpp (modified) (1 diff)
• Object.cpp (modified) (1 diff)
• Player.cpp (modified) (2 diffs)
• Spell.cpp (modified) (1 diff)
• Unit.h (modified) (2 diffs)

trunk/src/game/GameObject.cpp

@@ -1283 +1283 @@
         trigger->CastSpell(target, spell, true);
     }
-}
+    //trigger->setDeathState(JUST_DIED);
+    //trigger->RemoveCorpse();
+}

trunk/src/game/Object.cpp

@@ -602 +602 @@
                     {
                         if(target->isGameMaster())
-                            *data << cinfo->Modelid1;
+                        {
+                            if(cinfo->Modelid2)
+                                *data << cinfo->Modelid1;
+                            else
+                                *data << 17519; // world invisible trigger's model
+                        }
                         else
-                            *data << cinfo->Modelid3;
+                        {
+                            if(cinfo->Modelid2)
+                                *data << cinfo->Modelid2;
+                            else
+                                *data << 11686; // world invisible trigger's model
+                        }
                     }
                     else

trunk/src/game/Player.cpp

@@ -16407 +16407 @@
             // send data at target visibility change (adding to client)
             if((*i)!=this && (*i)->isType(TYPEMASK_UNIT))
+            {
                 SendAuraDurationsForTarget(*i);
+                //if(((Unit*)(*i))->isAlive()) //should be always alive
+                {
+                    if((*i)->GetTypeId()==TYPEID_UNIT)
+                        ((Creature*)(*i))->SendMonsterMoveWithSpeedToCurrentDestination(this);
+                    if(((Unit*)(*i))->getVictim())
+                        ((Unit*)(*i))->SendAttackStart(((Unit*)(*i))->getVictim());
+                }
+            }
 
             i = stealthedUnits.erase(i);
@@ -17387 +17396 @@
             // send data at target visibility change (adding to client)
             if(target!=this && target->isType(TYPEMASK_UNIT))
+            {
                 SendAuraDurationsForTarget((Unit*)target);
-
-            if(target->GetTypeId()==TYPEID_UNIT && ((Creature*)target)->isAlive())
-                ((Creature*)target)->SendMonsterMoveWithSpeedToCurrentDestination(this);
+                if(((Unit*)target)->isAlive())
+                {
+                    if(target->GetTypeId()==TYPEID_UNIT)
+                        ((Creature*)target)->SendMonsterMoveWithSpeedToCurrentDestination(this);
+                    if(((Unit*)target)->getVictim())
+                        ((Unit*)target)->SendAttackStart(((Unit*)target)->getVictim());
+                }
+            }
         }
     }

trunk/src/game/Spell.cpp

@@ -1013 +1013 @@
             // for delayed spells ignore negative spells (after duel end) for friendly targets
             // TODO: this cause soul transfer bugged
-            if(m_spellInfo->speed > 0.0f && !IsPositiveSpell(m_spellInfo->Id))
+            if(m_spellInfo->speed > 0.0f && unit->GetTypeId() == TYPEID_PLAYER && !IsPositiveSpell(m_spellInfo->Id))
             {
                 m_caster->SendSpellMiss(unit, m_spellInfo->Id, SPELL_MISS_EVADE);

trunk/src/game/Unit.h

@@ -943 +943 @@
         void DeMorph();
 
+        void SendAttackStart(Unit* pVictim); 
         void SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount);
         void SendSpellNonMeleeDamageLog(Unit *target,uint32 SpellID,uint32 Damage, SpellSchoolMask damageSchoolMask,uint32 AbsorbedDamage, uint32 Resist,bool PhysicalDamage, uint32 Blocked, bool CriticalHit = false);
@@ -1353 +1354 @@
     private:
         void SendAttackStop(Unit* victim);                  // only from AttackStop(Unit*)
-        void SendAttackStart(Unit* pVictim);                // only from Unit::AttackStart(Unit*)
+        //void SendAttackStart(Unit* pVictim);                // only from Unit::AttackStart(Unit*)
 
         void ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag, AuraTypeSet const& procAuraTypes, WeaponAttackType attType, SpellEntry const * procSpell, uint32 damage, SpellSchoolMask damageSchoolMask );