mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12103] Add config options to enable/ disable Outdoor PvP zones

Browse source
This commit is contained in:
Schmoozerd 2012-08-18 18:06:27 +02:00 • committed by Antz
parent 0084982d40
commit e8ef8dbad9
5 changed files with 54 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/game/OutdoorPvP/OutdoorPvPMgr.cpp
View file

@ -44,21 +44,29 @@ OutdoorPvPMgr::~OutdoorPvPMgr()
delete m_scripts[i];
}
#define LOAD_OPVP_ZONE(a) \
if (sWorld.getConfig(CONFIG_BOOL_OUTDOORPVP_##a##_ENABLED)) \
{ \
m_scripts[OPVP_ID_##a##] = new OutdoorPvP##a##(); \
++counter; \
}
/**
Function which loads all outdoor pvp scripts
*/
void OutdoorPvPMgr::InitOutdoorPvP()
{
m_scripts[OPVP_ID_SI] = new OutdoorPvPSI();
m_scripts[OPVP_ID_EP] = new OutdoorPvPEP();
m_scripts[OPVP_ID_HP] = new OutdoorPvPHP();
m_scripts[OPVP_ID_ZM] = new OutdoorPvPZM();
m_scripts[OPVP_ID_TF] = new OutdoorPvPTF();
m_scripts[OPVP_ID_NA] = new OutdoorPvPNA();
m_scripts[OPVP_ID_GH] = new OutdoorPvPGH();
uint8 counter = 0;
LOAD_OPVP_ZONE(SI);
LOAD_OPVP_ZONE(EP);
LOAD_OPVP_ZONE(HP);
LOAD_OPVP_ZONE(ZM);
LOAD_OPVP_ZONE(TF);
LOAD_OPVP_ZONE(NA);
LOAD_OPVP_ZONE(GH);
sLog.outString();
sLog.outString(">> Loaded %u Outdoor PvP zones", MAX_OPVP_ID);
sLog.outString(">> Loaded %u Outdoor PvP zones", counter);
}
OutdoorPvP* OutdoorPvPMgr::GetScript(uint32 zoneId)

7
src/game/World.cpp
View file

@ -751,6 +751,13 @@ void World::LoadConfigSettings(bool reload)
setConfig(CONFIG_UINT32_ARENA_SEASON_PREVIOUS_ID, "Arena.ArenaSeasonPrevious.ID", 0);
setConfigMin(CONFIG_INT32_ARENA_STARTRATING, "Arena.StartRating", -1, -1);
setConfigMin(CONFIG_INT32_ARENA_STARTPERSONALRATING, "Arena.StartPersonalRating", -1, -1);
setConfig(CONFIG_BOOL_OUTDOORPVP_SI_ENABLED, "OutdoorPvp.SIEnabled", true);
setConfig(CONFIG_BOOL_OUTDOORPVP_EP_ENABLED, "OutdoorPvp.EPEnabled", true);
setConfig(CONFIG_BOOL_OUTDOORPVP_HP_ENABLED, "OutdoorPvp.HPEnabled", true);
setConfig(CONFIG_BOOL_OUTDOORPVP_ZM_ENABLED, "OutdoorPvp.ZMEnabled", true);
setConfig(CONFIG_BOOL_OUTDOORPVP_TF_ENABLED, "OutdoorPvp.TFEnabled", true);
setConfig(CONFIG_BOOL_OUTDOORPVP_NA_ENABLED, "OutdoorPvp.NAEnabled", true);
setConfig(CONFIG_BOOL_OUTDOORPVP_GH_ENABLED, "OutdoorPvp.GHEnabled", true);
setConfig(CONFIG_BOOL_OFFHAND_CHECK_AT_TALENTS_RESET, "OffhandCheckAtTalentsReset", false);

7
src/game/World.h
View file

@ -328,6 +328,13 @@ enum eConfigBoolValues
CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS,
CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN,
CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT,
CONFIG_BOOL_OUTDOORPVP_SI_ENABLED,
CONFIG_BOOL_OUTDOORPVP_EP_ENABLED,
CONFIG_BOOL_OUTDOORPVP_HP_ENABLED,
CONFIG_BOOL_OUTDOORPVP_ZM_ENABLED,
CONFIG_BOOL_OUTDOORPVP_TF_ENABLED,
CONFIG_BOOL_OUTDOORPVP_NA_ENABLED,
CONFIG_BOOL_OUTDOORPVP_GH_ENABLED,
CONFIG_BOOL_KICK_PLAYER_ON_BAD_PACKET,
CONFIG_BOOL_STATS_SAVE_ONLY_ON_LOGOUT,
CONFIG_BOOL_CLEAN_CHARACTER_DB,

23
src/mangosd/mangosd.conf.dist.in
View file

@ -1538,6 +1538,29 @@ Arena.ArenaSeasonPrevious.ID = 0
Arena.StartRating = -1
Arena.StartPersonalRating = -1
###################################################################################################################
# OUTDOOR PVP CONFIG
#
# OutdoorPvp.SIEnabled #Enable Silithus Outdoor pvp
# OutdoorPvp.EPEnabled #Enable Eastern Plaguelands Outdoor pvp
# OutdoorPvp.HPEnabled #Enable Hellfire Peninsula Outdoor pvp
# OutdoorPvp.ZMEnabled #Enable Zangarmarsh Outdoor pvp
# OutdoorPvp.TFEnabled #Enable Terokkar Forest Outdoor pvp
# OutdoorPvp.NAEnabled #Enable Halaa (Nagrand) Outdoor pvp
# OutdoorPvp.GHEnabled #Enable Venture Bay (Grizzly Hills) Outdoor pvp
# Default: 1 (enable)
# 0 (disable)
#
###################################################################################################################
OutdoorPvp.SIEnabled = 1
OutdoorPvp.EPEnabled = 1
OutdoorPvp.HPEnabled = 1
OutdoorPvp.ZMEnabled = 1
OutdoorPvp.TFEnabled = 1
OutdoorPvp.NAEnabled = 1
OutdoorPvp.GHEnabled = 1
###################################################################################################################
# NETWORK CONFIG
#

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "0135"
#define REVISION_NR "12103"
#endif // __REVISION_NR_H__