mirror of
https://github.com/mangosfour/server.git
synced 2025-12-16 04:37:00 +00:00
[8590] Restore build at Unix/Linux.
This commit is contained in:
parent
f37f27d3c2
commit
d38866cfbc
10 changed files with 24 additions and 21 deletions
|
|
@ -232,6 +232,21 @@ enum AreaFlags
|
||||||
AREA_FLAG_OUTDOOR_PVP2 = 0x08000000 // Wintergrasp and it's subzones
|
AREA_FLAG_OUTDOOR_PVP2 = 0x08000000 // Wintergrasp and it's subzones
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum Difficulty
|
||||||
|
{
|
||||||
|
DUNGEON_DIFFICULTY_NORMAL = 0,
|
||||||
|
DUNGEON_DIFFICULTY_HEROIC = 1,
|
||||||
|
|
||||||
|
RAID_DIFFICULTY_10MAN_NORMAL = 0,
|
||||||
|
RAID_DIFFICULTY_25MAN_NORMAL = 1,
|
||||||
|
RAID_DIFFICULTY_10MAN_HEROIC = 2,
|
||||||
|
RAID_DIFFICULTY_25MAN_HEROIC = 3,
|
||||||
|
};
|
||||||
|
|
||||||
|
#define MAX_DUNGEON_DIFFICULTY 2
|
||||||
|
#define MAX_RAID_DIFFICULTY 4
|
||||||
|
#define MAX_DIFFICULTY 4
|
||||||
|
|
||||||
enum FactionTemplateFlags
|
enum FactionTemplateFlags
|
||||||
{
|
{
|
||||||
FACTION_TEMPLATE_FLAG_CONTESTED_GUARD = 0x00001000, // faction will attack players that were involved in PvP combats
|
FACTION_TEMPLATE_FLAG_CONTESTED_GUARD = 0x00001000, // faction will attack players that were involved in PvP combats
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@
|
||||||
#include "GroupRefManager.h"
|
#include "GroupRefManager.h"
|
||||||
#include "BattleGround.h"
|
#include "BattleGround.h"
|
||||||
#include "LootMgr.h"
|
#include "LootMgr.h"
|
||||||
|
#include "DBCEnums.h"
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@
|
||||||
#include <map>
|
#include <map>
|
||||||
#include "Utilities/UnorderedMap.h"
|
#include "Utilities/UnorderedMap.h"
|
||||||
#include "Database/DatabaseEnv.h"
|
#include "Database/DatabaseEnv.h"
|
||||||
|
#include "DBCEnums.h"
|
||||||
|
|
||||||
struct InstanceTemplate;
|
struct InstanceTemplate;
|
||||||
struct MapEntry;
|
struct MapEntry;
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,7 @@
|
||||||
#include "InstanceSaveMgr.h"
|
#include "InstanceSaveMgr.h"
|
||||||
#include "InstanceData.h"
|
#include "InstanceData.h"
|
||||||
#include "CreatureEventAIMgr.h"
|
#include "CreatureEventAIMgr.h"
|
||||||
|
#include "DBCEnums.h"
|
||||||
|
|
||||||
//reload commands
|
//reload commands
|
||||||
bool ChatHandler::HandleReloadAllCommand(const char*)
|
bool ChatHandler::HandleReloadAllCommand(const char*)
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@
|
||||||
#include "ScriptCalls.h"
|
#include "ScriptCalls.h"
|
||||||
#include "Group.h"
|
#include "Group.h"
|
||||||
#include "MapRefManager.h"
|
#include "MapRefManager.h"
|
||||||
|
#include "DBCEnums.h"
|
||||||
|
|
||||||
#include "MapInstanced.h"
|
#include "MapInstanced.h"
|
||||||
#include "InstanceSaveMgr.h"
|
#include "InstanceSaveMgr.h"
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "Map.h"
|
#include "Map.h"
|
||||||
#include "InstanceSaveMgr.h"
|
#include "InstanceSaveMgr.h"
|
||||||
|
#include "DBCEnums.h"
|
||||||
|
|
||||||
class MANGOS_DLL_DECL MapInstanced : public Map
|
class MANGOS_DLL_DECL MapInstanced : public Map
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@
|
||||||
#include "BattleGround.h"
|
#include "BattleGround.h"
|
||||||
#include "Pet.h"
|
#include "Pet.h"
|
||||||
#include "SocialMgr.h"
|
#include "SocialMgr.h"
|
||||||
|
#include "DBCEnums.h"
|
||||||
|
|
||||||
void WorldSession::HandleRepopRequestOpcode( WorldPacket & recv_data )
|
void WorldSession::HandleRepopRequestOpcode( WorldPacket & recv_data )
|
||||||
{
|
{
|
||||||
|
|
@ -1460,7 +1461,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode( WorldPacket & recv_data )
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(RaidDifficulties(mode) == _player->GetRaidDifficulty())
|
if(Difficulty(mode) == _player->GetRaidDifficulty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// cannot reset while in an instance
|
// cannot reset while in an instance
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@
|
||||||
#include "AchievementMgr.h"
|
#include "AchievementMgr.h"
|
||||||
#include "ReputationMgr.h"
|
#include "ReputationMgr.h"
|
||||||
#include "BattleGround.h"
|
#include "BattleGround.h"
|
||||||
|
#include "DBCEnums.h"
|
||||||
|
|
||||||
#include<string>
|
#include<string>
|
||||||
#include<vector>
|
#include<vector>
|
||||||
|
|
|
||||||
|
|
@ -2408,25 +2408,6 @@ enum DiminishingGroup
|
||||||
DIMINISHING_LIMITONLY
|
DIMINISHING_LIMITONLY
|
||||||
};
|
};
|
||||||
|
|
||||||
enum Difficulty
|
|
||||||
{
|
|
||||||
DUNGEON_DIFFICULTY_NORMAL = 0,
|
|
||||||
DUNGEON_DIFFICULTY_HEROIC = 1,
|
|
||||||
|
|
||||||
RAID_DIFFICULTY_10MAN_NORMAL = 0,
|
|
||||||
RAID_DIFFICULTY_25MAN_NORMAL = 1,
|
|
||||||
RAID_DIFFICULTY_10MAN_HEROIC = 2,
|
|
||||||
RAID_DIFFICULTY_25MAN_HEROIC = 3,
|
|
||||||
};
|
|
||||||
|
|
||||||
#define MAX_DUNGEON_DIFFICULTY 2
|
|
||||||
#define MAX_RAID_DIFFICULTY 4
|
|
||||||
#define MAX_DIFFICULTY 4
|
|
||||||
|
|
||||||
enum RaidDifficulties
|
|
||||||
{
|
|
||||||
};
|
|
||||||
|
|
||||||
enum SummonType
|
enum SummonType
|
||||||
{
|
{
|
||||||
SUMMON_TYPE_CRITTER = 41,
|
SUMMON_TYPE_CRITTER = 41,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "8589"
|
#define REVISION_NR "8590"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue