Skip to content
Browse files

Missing changes to previous commit... (Grr didn't wanted to commit be…

…fore compiling)
  • Loading branch information...
1 parent 5cff9e0 commit 030f80d66f5bf988e5bc9c1422518f813fec3ca8 @Spp- Spp- committed Feb 23, 2012
View
12 src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -666,16 +666,16 @@ bool AuctionEntry::BuildAuctionInfo(WorldPacket& data) const
data << uint32(item->GetEnchantmentCharges(EnchantmentSlot(i)));
}
- data << int32(pItem->GetItemRandomPropertyId()); // random item property id
- data << uint32(pItem->GetItemSuffixFactor()); // SuffixFactor
- data << uint32(pItem->GetCount()); // item->count
- data << uint32(pItem->GetSpellCharges()); // item->charge FFFFFFF
+ data << int32(item->GetItemRandomPropertyId()); // Random item property id
+ data << uint32(item->GetItemSuffixFactor()); // SuffixFactor
+ data << uint32(item->GetCount()); // item->count
+ data << uint32(item->GetSpellCharges()); // item->charge FFFFFFF
data << uint32(0); // Unknown
data << uint64(owner); // Auction->owner
data << uint64(startbid); // Auction->startbid (not sure if useful)
data << uint64(bid ? GetAuctionOutBid() : 0);
- //minimal outbid
- data << uint64(buyout); // auction->buyout
+ // Minimal outbid
+ data << uint64(buyout); // Auction->buyout
data << uint32((expire_time - time(NULL)) * IN_MILLISECONDS); // time left
data << uint64(bidder); // auction->bidder current
data << uint64(bid); // current bid
View
10 src/server/game/Globals/ObjectMgr.cpp
@@ -2207,7 +2207,7 @@ void ObjectMgr::LoadItemTemplates()
if (!sparse || !db2Data)
continue;
- ItemTemplate& itemTemplate = ItemTemplateStore[itemId];
+ ItemTemplate& itemTemplate = _itemTemplateStore[itemId];
itemTemplate.ItemId = itemId;
itemTemplate.Class = db2Data->Class;
@@ -2352,10 +2352,10 @@ void ObjectMgr::LoadItemTemplates()
{
Field* fields = result->Fetch();
uint32 itemId = fields[0].GetUInt32();
- if (ItemTemplateStore.find(itemId) != ItemTemplateStore.end())
+ if (_itemTemplateStore.find(itemId) != _itemTemplateStore.end())
--sparseCount;
- ItemTemplate& itemTemplate = ItemTemplateStore[itemId];
+ ItemTemplate& itemTemplate = _itemTemplateStore[itemId];
itemTemplate.ItemId = itemId;
itemTemplate.Class = fields[1].GetUInt32();
@@ -2517,7 +2517,7 @@ void ObjectMgr::LoadItemTemplateAddon()
std::swap(minMoneyLoot, maxMoneyLoot);
}
- ItemTemplate& itemTemplate = ItemTemplateStore[itemId];
+ ItemTemplate& itemTemplate = _itemTemplateStore[itemId];
itemTemplate.BuyCount = buyCount;
itemTemplate.FoodType = foodType;
itemTemplate.MinMoneyLoot = minMoneyLoot;
@@ -2549,7 +2549,7 @@ void ObjectMgr::LoadItemScriptNames()
continue;
}
- ItemTemplateStore[itemId].ScriptId = GetScriptId(fields[1].GetCString());
+ _itemTemplateStore[itemId].ScriptId = GetScriptId(fields[1].GetCString());
++count;
} while (result->NextRow());
}
View
9 src/server/game/Server/WorldSocket.cpp
@@ -801,15 +801,14 @@ int WorldSocket::HandleSendAuthSession()
int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
{
uint8 digest[20];
+ uint32 clientSeed;
uint16 clientBuild, security;
uint32 id;
uint32 m_addonSize;
- uint32 clientSeed;
- std::string account;
LocaleConstant locale;
-
- SHA1Hash sha1;
- BigNumber v, s, g, N, K;
+ std::string account;
+ SHA1Hash sha;
+ BigNumber v, s, g, N, k;
WorldPacket packet;
recvPacket.read_skip<uint8>();
View
2 src/server/game/Spells/Auras/SpellAuras.cpp
@@ -153,7 +153,7 @@ void AuraApplication::_InitFlags(Unit* caster, uint8 effMask)
{
if (((1 << i) & effMask) && GetBase()->GetSpellInfo()->Effects[i].ApplyAuraName == SPELL_AURA_MOUNTED)
{
- m_flags |= AFLAG_ANY_EFFECT_AMOUNT_SENT;
+ _flags |= AFLAG_ANY_EFFECT_AMOUNT_SENT;
break;
}
}
View
9 src/server/game/Spells/Spell.cpp
@@ -1026,7 +1026,7 @@ void Spell::SelectImplicitConeTargets(SpellEffIndex effIndex, SpellImplicitTarge
{
Unit::AuraEffectList const& Auras = m_caster->GetAuraEffectsByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS);
for (Unit::AuraEffectList::const_iterator j = Auras.begin(); j != Auras.end(); ++j)
- if ((*j)->IsAffectedOnSpell(m_spellInfo))
+ if ((*j)->IsAffectingSpell(m_spellInfo))
maxTargets += (*j)->GetAmount();
Trinity::RandomResizeList(targets, maxTargets);
@@ -1319,7 +1319,7 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge
{
Unit::AuraEffectList const& Auras = m_caster->GetAuraEffectsByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS);
for (Unit::AuraEffectList::const_iterator j = Auras.begin(); j != Auras.end(); ++j)
- if ((*j)->IsAffectedOnSpell(m_spellInfo))
+ if ((*j)->IsAffectingSpell(m_spellInfo))
maxTargets += (*j)->GetAmount();
if (m_spellInfo->Id == 5246) //Intimidating Shout
@@ -1339,7 +1339,7 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge
{
Unit::AuraEffectList const& Auras = m_caster->GetAuraEffectsByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS);
for (Unit::AuraEffectList::const_iterator j = Auras.begin(); j != Auras.end(); ++j)
- if ((*j)->IsAffectedOnSpell(m_spellInfo))
+ if ((*j)->IsAffectingSpell(m_spellInfo))
maxTargets += (*j)->GetAmount();
Trinity::RandomResizeList(gObjTargets, maxTargets);
@@ -3771,9 +3771,6 @@ void Spell::SendCastResult(Player* caster, SpellInfo const* spellInfo, uint8 cas
case SPELL_FAILED_NEED_EXOTIC_AMMO:
data << uint32(spellInfo->EquippedItemSubClassMask); // seems correct...
break;
- case SPELL_FAILED_REAGENTS:
- data << uint32(0); // Item id
- break;
case SPELL_FAILED_NEED_MORE_ITEMS:
data << uint32(0); // Item id
data << uint32(0); // Item count?

0 comments on commit 030f80d

Please sign in to comment.
Something went wrong with that request. Please try again.