Merge pull request #3 from EQEmu/master

sync
This commit is contained in:
josheb
2013-05-06 14:16:46 -07:00
216 changed files with 4167 additions and 4149 deletions
+5 -5
View File
@@ -518,7 +518,7 @@ void Group::SplitExp(uint32 exp, Mob* other) {
uint8 maxlevel = 1;
for (i = 0; i < MAX_GROUP_MEMBERS; i++) {
if (members[i] != NULL) {
if (members[i] != nullptr) {
if(members[i]->GetLevel() > maxlevel)
maxlevel = members[i]->GetLevel();
@@ -550,7 +550,7 @@ void Group::SplitExp(uint32 exp, Mob* other) {
return;
for (i = 0; i < MAX_GROUP_MEMBERS; i++) {
if (members[i] != NULL && members[i]->IsClient()) // If Group Member is Client
if (members[i] != nullptr && members[i]->IsClient()) // If Group Member is Client
{
Client *cmember = members[i]->CastToClient();
// add exp + exp cap
@@ -579,7 +579,7 @@ void Raid::SplitExp(uint32 exp, Mob* other) {
uint8 maxlevel = 1;
for (int i = 0; i < MAX_RAID_MEMBERS; i++) {
if (members[i].member != NULL) {
if (members[i].member != nullptr) {
if(members[i].member->GetLevel() > maxlevel)
maxlevel = members[i].member->GetLevel();
@@ -597,7 +597,7 @@ void Raid::SplitExp(uint32 exp, Mob* other) {
return;
for (unsigned int x = 0; x < MAX_RAID_MEMBERS; x++) {
if (members[x].member != NULL) // If Group Member is Client
if (members[x].member != nullptr) // If Group Member is Client
{
Client *cmember = members[x].member;
// add exp + exp cap
@@ -650,7 +650,7 @@ void Client::SendLeadershipEXPUpdate() {
uint32 Client::GetCharMaxLevelFromQGlobal() {
QGlobalCache *char_c = NULL;
QGlobalCache *char_c = nullptr;
char_c = this->GetQGlobals();
std::list<QGlobal> globalMap;