From 088ed3ff69b50b4a90be27ea2b7ce6857da0a430 Mon Sep 17 00:00:00 2001 From: stfx Date: Sat, 18 Aug 2012 00:12:31 +0200 Subject: [PATCH] [12100] Finalize Outdoor PvP Implementation Implementation by Xfurry and stfx Thanks to all original Outdoor PvP authors - especially Balrok Thanks to X-Savior for the proper data Thanks to crackm for help with database And thanks to all people who contributed and/or posted bug reports Signed-off-by: Schmoozerd --- src/game/World.cpp | 6 ++++++ src/shared/revision_nr.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/game/World.cpp b/src/game/World.cpp index 251e811cd..58e913010 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -50,6 +50,7 @@ #include "CreatureAIRegistry.h" #include "Policies/SingletonImp.h" #include "BattleGroundMgr.h" +#include "OutdoorPvP/OutdoorPvP.h" #include "TemporarySummon.h" #include "VMapFactory.h" #include "MoveMap.h" @@ -1370,6 +1371,10 @@ void World::SetInitialWorldSettings() sBattleGroundMgr.CreateInitialBattleGrounds(); sBattleGroundMgr.InitAutomaticArenaPointDistribution(); + ///- Initialize Outdoor PvP + sLog.outString("Starting Outdoor PvP System"); + sOutdoorPvPMgr.InitOutdoorPvP(); + // Not sure if this can be moved up in the sequence (with static data loading) as it uses MapManager sLog.outString("Loading Transports..."); sMapMgr.LoadTransports(); @@ -1538,6 +1543,7 @@ void World::Update(uint32 diff) ///- Update objects (maps, transport, creatures,...) sMapMgr.Update(diff); sBattleGroundMgr.Update(diff); + sOutdoorPvPMgr.Update(diff); ///- Delete all characters which have been deleted X days before if (m_timers[WUPDATE_DELETECHARS].Passed()) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c7eb86ff3..fa69a2e6e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12099" + #define REVISION_NR "12100" #endif // __REVISION_NR_H__