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/GameObject.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 MANGOSSERVER_GAMEOBJECT_H 
    20 #define MANGOSSERVER_GAMEOBJECT_H 
     21#ifndef TRINITYCORE_GAMEOBJECT_H 
     22#define TRINITYCORE_GAMEOBJECT_H 
    2123 
    2224#include "Common.h" 
    … …  
    382384    uint32 go_state; 
    383385    uint8 spawnMask; 
     386    uint32 ArtKit; 
    384387}; 
    385388 
    … …  
    408411#define FISHING_BOBBER_READY_TIME 5 
    409412 
    410 class MANGOS_DLL_SPEC GameObject : public WorldObject 
     413class TRINITY_DLL_SPEC GameObject : public WorldObject 
    411414{ 
    412415    public: 
    … …  
    417420        void RemoveFromWorld(); 
    418421 
    419         bool Create(uint32 guidlow, uint32 name_id, Map *map, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, uint32 go_state); 
     422        bool Create(uint32 guidlow, uint32 name_id, Map *map, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, uint32 go_state, uint32 ArtKit = 0); 
    420423        void Update(uint32 p_time); 
    421424        static GameObject* GetGameObject(WorldObject& object, uint64 guid); 
    … …  
    503506        void SetGoState(uint32 state) { SetUInt32Value(GAMEOBJECT_STATE, state); } 
    504507        uint32 GetGoArtKit() const { return GetUInt32Value(GAMEOBJECT_ARTKIT); } 
    505         void SetGoArtKit(uint32 artkit) { SetUInt32Value(GAMEOBJECT_ARTKIT, artkit); } 
     508        void SetGoArtKit(uint32 artkit); 
    506509        uint32 GetGoAnimProgress() const { return GetUInt32Value(GAMEOBJECT_ANIMPROGRESS); } 
    507510        void SetGoAnimProgress(uint32 animprogress) { SetUInt32Value(GAMEOBJECT_ANIMPROGRESS, animprogress); }