Changeset 149 for trunk/src/game/ObjectMgr.cpp

Timestamp:

11/19/08 13:40:46 (17 years ago)

Author:

yumileroy

Message:

[svn] *Implement new player conditions CONDITION_NO_AURA, CONDITION_ACTIVE_EVENT
* Default behaviour of pets for creatures changed to REACT_DEFENSIVE
* Disallowed sending wrapped items as COD
* Prevent loading and saving single target auras for pet in same way as already implemented for player
* Correctly limit use some flask types to zones.
* Fixed extracting common.MPQ under *nix
* Many small xleanups and fixes.
** mangos merge rev.

TEST REV so be careful of creepy crawly bugs!

Original author: KingPin?
Date: 2008-11-02 16:53:46-06:00

Files:

• trunk/src/game/ObjectMgr.cpp (modified) (2 diffs)

trunk/src/game/ObjectMgr.cpp

@@ -6570 +6570 @@
             return false;
         }
+                case CONDITION_NO_AURA:
+                        return !player->HasAura(value1, value2);
+                case CONDITION_ACTIVE_EVENT:
+                        return gameeventmgr.IsActiveEvent(value1);
         default:
             return false;
@@ -6690 +6694 @@
             break;
         }
+                case CONDITION_NO_AURA:
+                {
+                        if(!sSpellStore.LookupEntry(value1))
+                        {
+                                sLog.outErrorDb("Aura condition requires to have non existing spell (Id: %d), skipped", value1);
+                                return false;
+                        }
+                        if(value2 > 2)
+                        {
+                                sLog.outErrorDb("Aura condition requires to have non existing effect index (%u) (must be 0..2), skipped", value2);
+                                return false;
+                        }
+                        break;
+                }
+                case CONDITION_ACTIVE_EVENT:
+                {
+                        GameEvent::GameEventDataMap const& events = gameeventmgr.GetEventMap();
+                        if(value1 >=events.size() || !events[value1].isValid())
+                        {
+                                sLog.outErrorDb("Active event condition requires existed event id (%u), skipped", value1);
+                                return false;
+                        }
+                        break;
+                }
     }
     return true;