* Rename InstanceData to InstanceScript
* Rename *mgr to their new names in scripts project * Mass convert all the scripts (NEEDS THOROUGH TESTING, because it was done automatically) Please, report bugs on issue tracker. --HG-- branch : trunk rename : src/server/game/Instances/InstanceData.cpp => src/server/game/Instances/InstanceScript.cpp rename : src/server/game/Instances/InstanceData.h => src/server/game/Instances/InstanceScript.h
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
#include "Log.h"
|
||||
#include "GridStates.h"
|
||||
#include "CellImpl.h"
|
||||
#include "InstanceData.h"
|
||||
#include "InstanceScript.h"
|
||||
#include "Map.h"
|
||||
#include "GridNotifiersImpl.h"
|
||||
#include "Config.h"
|
||||
@@ -2266,7 +2266,7 @@ bool InstanceMap::CanEnter(Player *player)
|
||||
// cannot enter while an encounter is in progress on raids
|
||||
/*Group *pGroup = player->GetGroup();
|
||||
if (!player->isGameMaster() && pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())*/
|
||||
if (IsRaid() && GetInstanceData() && GetInstanceData()->IsEncounterInProgress())
|
||||
if (IsRaid() && GetInstanceScript() && GetInstanceScript()->IsEncounterInProgress())
|
||||
{
|
||||
player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
|
||||
return false;
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
class Unit;
|
||||
class WorldPacket;
|
||||
class InstanceData;
|
||||
class InstanceScript;
|
||||
class Group;
|
||||
class InstanceSave;
|
||||
class Object;
|
||||
@@ -592,7 +592,7 @@ class InstanceMap : public Map
|
||||
void CreateInstanceData(bool load);
|
||||
bool Reset(uint8 method);
|
||||
uint32 GetScriptId() { return i_script_id; }
|
||||
InstanceData* GetInstanceData() { return i_data; }
|
||||
InstanceScript* GetInstanceScript() { return i_data; }
|
||||
void PermBindAllPlayers(Player *player);
|
||||
void UnloadAll();
|
||||
bool CanEnter(Player* player);
|
||||
@@ -606,7 +606,7 @@ class InstanceMap : public Map
|
||||
private:
|
||||
bool m_resetAfterUnload;
|
||||
bool m_unloadWhenEmpty;
|
||||
InstanceData* i_data;
|
||||
InstanceScript* i_data;
|
||||
uint32 i_script_id;
|
||||
};
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "Transport.h"
|
||||
#include "GridDefines.h"
|
||||
#include "MapInstanced.h"
|
||||
#include "InstanceData.h"
|
||||
#include "InstanceScript.h"
|
||||
#include "DestinationHolderImp.h"
|
||||
#include "Config.h"
|
||||
#include "World.h"
|
||||
|
||||
Reference in New Issue
Block a user