Changeset 44 for trunk/src/game/Spell.h

Show
Ignore:
Timestamp:
11/19/08 13:27:40 (17 years ago)
Author:
yumileroy
Message:

[svn] * Merge Temp dev SVN with Assembla.
* Changes include:

  • Implementation of w12x's Outdoor PvP and Game Event Systems.
  • Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed).
  • All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql).
  • Improved Config cleanup.
  • And many more changes.

Original author: Seline
Date: 2008-10-14 11:57:03-05:00

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/game/Spell.h

    r37 r44  
    11/* 
    2  * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> 
     2 * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> 
     3 * 
     4 * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> 
    35 * 
    46 * This program is free software; you can redistribute it and/or modify 
     
    911 * This program is distributed in the hope that it will be useful, 
    1012 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
    1214 * GNU General Public License for more details. 
    1315 * 
    1416 * You should have received a copy of the GNU General Public License 
    1517 * along with this program; if not, write to the Free Software 
    16  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    1719 */ 
    1820 
     
    7981bool IsQuestTameSpell(uint32 spellId); 
    8082 
    81 namespace MaNGOS 
     83namespace Trinity 
    8284{ 
    8385    struct SpellNotifierPlayer; 
     
    185187class Spell 
    186188{ 
    187     friend struct MaNGOS::SpellNotifierPlayer; 
    188     friend struct MaNGOS::SpellNotifierCreatureAndPlayer; 
     189    friend struct Trinity::SpellNotifierPlayer; 
     190    friend struct Trinity::SpellNotifierCreatureAndPlayer; 
    189191    public: 
    190192 
     
    534536}; 
    535537 
    536 namespace MaNGOS 
    537 { 
    538     struct MANGOS_DLL_DECL SpellNotifierPlayer 
     538namespace Trinity 
     539{ 
     540    struct TRINITY_DLL_DECL SpellNotifierPlayer 
    539541    { 
    540542        std::list<Unit*> &i_data; 
     
    571573    }; 
    572574 
    573     struct MANGOS_DLL_DECL SpellNotifierCreatureAndPlayer 
     575    struct TRINITY_DLL_DECL SpellNotifierCreatureAndPlayer 
    574576    { 
    575577        std::list<Unit*> *i_data;