josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Minor code cleanup before next commits

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Spp
2010-09-10 13:37:33 +02:00
parent 842a79d38c
commit fd14d7195f
5 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Groups/Group.cpp
+8 -6
View File
@@ -162,13 +162,15 @@ bool Group::LoadGroupFromDB(const uint32 &groupGuid, QueryResult_AutoPtr result,
uint32 diff = fields[13].GetUInt8();
if (diff >= MAX_DUNGEON_DIFFICULTY)
diff = DUNGEON_DIFFICULTY_NORMAL;
m_dungeonDifficulty = Difficulty(diff);
m_dungeonDifficulty = DUNGEON_DIFFICULTY_NORMAL;
else
m_dungeonDifficulty = Difficulty(diff);
uint32 r_diff = fields[14].GetUInt8();
if (r_diff >= MAX_RAID_DIFFICULTY)
r_diff = RAID_DIFFICULTY_10MAN_NORMAL;
m_raidDifficulty = Difficulty(r_diff);
m_raidDifficulty = RAID_DIFFICULTY_10MAN_NORMAL;
else
m_raidDifficulty = Difficulty(r_diff);
if (loadMembers)
{
@@ -340,7 +342,7 @@ bool Group::AddMember(const uint64 &guid, const char* name)
player->SetGroupUpdateFlag(GROUP_UPDATE_FULL);
UpdatePlayerOutOfRange(player);
// quest related GO state dependent from raid memebership
// quest related GO state dependent from raid membership
if (isRaidGroup())
player->UpdateForQuestWorldObjects();
@@ -431,7 +433,7 @@ void Group::ChangeLeader(const uint64 &guid)
SendUpdate();
}
void Group::Disband(bool hideDestroy)
void Group::Disband(bool hideDestroy /* = false */)
{
Player *player;
src/server/game/Groups/Group.h
+7 -8
View File
@@ -23,10 +23,8 @@
#include "GroupReference.h"
#include "GroupRefManager.h"
#include "Battleground.h"
#include "LootMgr.h"
#include "DBCEnums.h"
#include "Unit.h"
#include "Battleground.h"
#include <map>
#include <vector>
@@ -38,6 +36,11 @@
#define GROUP_MAX_LFG_KICKS 3
#define GROUP_LFG_KICK_VOTES_NEEDED 3
class InstanceSave;
class Player;
class Unit;
class WorldSession;
enum RollVote
{
PASS = 0,
@@ -86,8 +89,6 @@ enum GroupType
// 0x10, leave/change group?, I saw this flag when leaving group and after leaving BG while in group
};
class Battleground;
enum GroupUpdateFlags
{
GROUP_UPDATE_FLAG_NONE = 0x00000000, // nothing
@@ -119,8 +120,6 @@ enum GroupUpdateFlags
// 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,19
static const uint8 GroupUpdateLength[GROUP_UPDATE_FLAGS_COUNT] = { 0, 2, 2, 2, 1, 2, 2, 2, 2, 4, 8, 8, 1, 2, 2, 2, 1, 2, 2, 8};
class InstanceSave;
class Roll : public LootValidatorRef
{
public:
@@ -151,7 +150,7 @@ struct InstanceGroupBind
{
InstanceSave *save;
bool perm;
/* permanent InstanceGroupBinds exist iff the leader has a permanent
/* permanent InstanceGroupBinds exist if the leader has a permanent
PlayerInstanceBind for the same instance. */
InstanceGroupBind() : save(NULL), perm(false) {}
};