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/GridNotifiers.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 
    19 #ifndef MANGOS_GRIDNOTIFIERS_H 
    20 #define MANGOS_GRIDNOTIFIERS_H 
     21#ifndef TRINITY_GRIDNOTIFIERS_H 
     22#define TRINITY_GRIDNOTIFIERS_H 
    2123 
    2224#include "ObjectGridLoader.h" 
     
    3537//class Map; 
    3638 
    37 namespace MaNGOS 
     39namespace Trinity 
    3840{ 
    3941 
    40     struct MANGOS_DLL_DECL PlayerNotifier 
     42    struct TRINITY_DLL_DECL PlayerNotifier 
    4143    { 
    4244        explicit PlayerNotifier(Player &pl) : i_player(pl) {} 
     
    4648    }; 
    4749 
    48     struct MANGOS_DLL_DECL VisibleNotifier 
     50    struct TRINITY_DLL_DECL VisibleNotifier 
    4951    { 
    5052        Player &i_player; 
     
    6062    }; 
    6163 
    62     struct MANGOS_DLL_DECL VisibleChangesNotifier 
     64    struct TRINITY_DLL_DECL VisibleChangesNotifier 
    6365    { 
    6466        WorldObject &i_object; 
     
    6971    }; 
    7072 
    71     struct MANGOS_DLL_DECL GridUpdater 
     73    struct TRINITY_DLL_DECL GridUpdater 
    7274    { 
    7375        GridType &i_grid; 
     
    8890    }; 
    8991 
    90     struct MANGOS_DLL_DECL MessageDeliverer 
     92    struct TRINITY_DLL_DECL MessageDeliverer 
    9193    { 
    9294        Player &i_player; 
     
    98100    }; 
    99101 
    100     struct MANGOS_DLL_DECL ObjectMessageDeliverer 
     102    struct TRINITY_DLL_DECL ObjectMessageDeliverer 
    101103    { 
    102104        WorldPacket *i_message; 
     
    106108    }; 
    107109 
    108     struct MANGOS_DLL_DECL MessageDistDeliverer 
     110    struct TRINITY_DLL_DECL MessageDistDeliverer 
    109111    { 
    110112        Player &i_player; 
     
    118120    }; 
    119121 
    120     struct MANGOS_DLL_DECL ObjectMessageDistDeliverer 
     122    struct TRINITY_DLL_DECL ObjectMessageDistDeliverer 
    121123    { 
    122124        WorldObject &i_object; 
     
    128130    }; 
    129131 
    130     struct MANGOS_DLL_DECL ObjectUpdater 
     132    struct TRINITY_DLL_DECL ObjectUpdater 
    131133    { 
    132134        uint32 i_timeDiff; 
     
    139141 
    140142    template<class T> 
    141         struct MANGOS_DLL_DECL ObjectAccessorNotifier 
     143        struct TRINITY_DLL_DECL ObjectAccessorNotifier 
    142144    { 
    143145        T *& i_object; 
     
    165167    }; 
    166168 
    167     struct MANGOS_DLL_DECL PlayerRelocationNotifier 
     169    struct TRINITY_DLL_DECL PlayerRelocationNotifier 
    168170    { 
    169171        Player &i_player; 
     
    174176    }; 
    175177 
    176     struct MANGOS_DLL_DECL CreatureRelocationNotifier 
     178    struct TRINITY_DLL_DECL CreatureRelocationNotifier 
    177179    { 
    178180        Creature &i_creature; 
     
    184186    }; 
    185187 
    186     struct MANGOS_DLL_DECL DynamicObjectUpdater 
     188    struct TRINITY_DLL_DECL DynamicObjectUpdater 
    187189    { 
    188190        DynamicObject &i_dynobject; 
     
    210212 
    211213    template<class Check> 
    212         struct MANGOS_DLL_DECL WorldObjectSearcher 
     214        struct TRINITY_DLL_DECL WorldObjectSearcher 
    213215    { 
    214216        WorldObject* &i_object; 
     
    227229 
    228230    template<class Check> 
    229         struct MANGOS_DLL_DECL WorldObjectListSearcher 
     231        struct TRINITY_DLL_DECL WorldObjectListSearcher 
    230232    { 
    231233        std::list<WorldObject*> &i_objects; 
     
    244246 
    245247    template<class Do> 
    246         struct MANGOS_DLL_DECL WorldObjectWorker 
     248        struct TRINITY_DLL_DECL WorldObjectWorker 
    247249    { 
    248250        Do const& i_do; 
     
    285287 
    286288    template<class Check> 
    287         struct MANGOS_DLL_DECL GameObjectSearcher 
     289        struct TRINITY_DLL_DECL GameObjectSearcher 
    288290    { 
    289291        GameObject* &i_object; 
     
    299301    // Last accepted by Check GO if any (Check can change requirements at each call) 
    300302    template<class Check> 
    301         struct MANGOS_DLL_DECL GameObjectLastSearcher 
     303        struct TRINITY_DLL_DECL GameObjectLastSearcher 
    302304    { 
    303305        GameObject* &i_object; 
     
    312314 
    313315    template<class Check> 
    314         struct MANGOS_DLL_DECL GameObjectListSearcher 
     316        struct TRINITY_DLL_DECL GameObjectListSearcher 
    315317    { 
    316318        std::list<GameObject*> &i_objects; 
     
    328330    // First accepted by Check Unit if any 
    329331    template<class Check> 
    330         struct MANGOS_DLL_DECL UnitSearcher 
     332        struct TRINITY_DLL_DECL UnitSearcher 
    331333    { 
    332334        Unit* &i_object; 
     
    343345    // Last accepted by Check Unit if any (Check can change requirements at each call) 
    344346    template<class Check> 
    345         struct MANGOS_DLL_DECL UnitLastSearcher 
     347        struct TRINITY_DLL_DECL UnitLastSearcher 
    346348    { 
    347349        Unit* &i_object; 
     
    358360    // All accepted by Check units if any 
    359361    template<class Check> 
    360         struct MANGOS_DLL_DECL UnitListSearcher 
     362        struct TRINITY_DLL_DECL UnitListSearcher 
    361363    { 
    362364        std::list<Unit*> &i_objects; 
     
    374376 
    375377    template<class Check> 
    376         struct MANGOS_DLL_DECL CreatureSearcher 
     378        struct TRINITY_DLL_DECL CreatureSearcher 
    377379    { 
    378380        Creature* &i_object; 
     
    388390    // Last accepted by Check Creature if any (Check can change requirements at each call) 
    389391    template<class Check> 
    390         struct MANGOS_DLL_DECL CreatureLastSearcher 
     392        struct TRINITY_DLL_DECL CreatureLastSearcher 
    391393    { 
    392394        Creature* &i_object; 
     
    401403 
    402404    template<class Check> 
    403         struct MANGOS_DLL_DECL CreatureListSearcher 
     405        struct TRINITY_DLL_DECL CreatureListSearcher 
    404406    { 
    405407        std::list<Creature*> &i_objects; 
     
    416418 
    417419    template<class Check> 
    418     struct MANGOS_DLL_DECL PlayerSearcher 
     420    struct TRINITY_DLL_DECL PlayerSearcher 
    419421    { 
    420422        Player* &i_object; 
     
    429431 
    430432    template<class Do> 
    431     struct MANGOS_DLL_DECL PlayerWorker 
     433    struct TRINITY_DLL_DECL PlayerWorker 
    432434    { 
    433435        Do& i_do;