diff options
| author | Michael <michaelneubert1988@gmail.com> | 2014-05-25 21:52:27 +0200 |
|---|---|---|
| committer | Michael <michaelneubert1988@gmail.com> | 2014-05-25 21:52:27 +0200 |
| commit | 15efe08a60d3ccb277dde03abc6cce562ad0b44b (patch) | |
| tree | 9c2a48c3e55a000205ed0f3159d0684f29a0d994 /src/server/game/Battlefield/Battlefield.h | |
| parent | 49a17c6282fac3d2636e3db740b1a6960fb387ba (diff) | |
| parent | c06dc7d37aa8c795ff505550a7bc388d2a66ecac (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/SpellEffects.cpp
src/server/game/Weather/Weather.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
src/server/scripts/Spells/spell_hunter.cpp
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.h')
| -rw-r--r-- | src/server/game/Battlefield/Battlefield.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h index 4e2e28f124c..1b142d1c89f 100644 --- a/src/server/game/Battlefield/Battlefield.h +++ b/src/server/game/Battlefield/Battlefield.h @@ -174,7 +174,7 @@ class BfGraveyard // Check if this graveyard has a spirit guide bool HasNpc(uint64 guid); - // Check if a player is in this graveyard's ressurect queue + // Check if a player is in this graveyard's resurrect queue bool HasPlayer(uint64 guid) { return m_ResurrectQueue.find(guid) != m_ResurrectQueue.end(); } // Get the graveyard's ID. @@ -387,7 +387,7 @@ class Battlefield : public ZoneScript // Graveyard variables GraveyardVect m_GraveyardList; // Vector witch contain the different GY of the battle - uint32 m_LastResurectTimer; // Timer for resurect player every 30 sec + uint32 m_LastResurrectTimer; // Timer for resurrect player every 30 sec uint32 m_StartGroupingTimer; // Timer for invite players in area 15 minute before start battle bool m_StartGrouping; // bool for know if all players in area has been invited |